UNLOZE/sourcemod
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move DBManager and DB natives from core to logic (bug 5953, r=fyren).

Browse Source 
--HG--
rename : core/Database.cpp => core/logic/Database.cpp
rename : core/Database.h => core/logic/Database.h
rename : core/sm_simple_prioqueue.h => core/logic/sm_simple_prioqueue.h
rename : core/smn_database.cpp => core/logic/smn_database.cpp
rename : core/sm_queue.h => public/sm_queue.h
This commit is contained in:
Nicholas Hastings
2013-10-09 08:43:08 -04:00
parent 9027d15211
commit 1d1b5d1c6d
10 changed files with 77 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/logic_bridge.cpp
+15
View File
@@ -46,6 +46,7 @@
#include "AdminCache.h"
#include "HalfLife2.h"
#include "CoreConfig.h"
#include "IDBDriver.h"
#if SOURCE_ENGINE == SE_DOTA
#include "convar_sm_dota.h"
#elif SOURCE_ENGINE >= SE_ALIENSWARM
@@ -261,6 +262,19 @@ static bool is_map_running()
return g_SourceMod.IsMapRunning();
}
static DatabaseInfo keyvalues_to_dbinfo(KeyValues *kv)
{
DatabaseInfo info;
info.database = kv->GetString("database", "");
info.driver = kv->GetString("driver", "default");
info.host = kv->GetString("host", "");
info.maxTimeout = kv->GetInt("timeout", 0);
info.pass = kv->GetString("pass", "");
info.port = kv->GetInt("port", 0);
info.user = kv->GetString("user", "");
return info;
}
int read_cmd_argc(const CCommand &args)
{
return args.ArgC();
@@ -394,6 +408,7 @@ static sm_core_t core_bridge =
do_global_plugin_loads,
SM_AreConfigsExecuted,
SM_ExecuteForPlugin,
keyvalues_to_dbinfo,
GAMEFIX,
&serverGlobals
};