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

Split intercom.h into separate headers and reduce shared header inclusion.

Browse Source
This commit is contained in:
David Anderson
2015-08-31 10:00:49 -07:00
parent 4f1705e001
commit 4e275eea97
66 changed files with 881 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/logic_bridge.cpp
+11 -11
View File
@@ -34,7 +34,6 @@
#include "sourcemm_api.h"
#include "sm_globals.h"
#include "sm_autonatives.h"
#include "logic/intercom.h"
#include "sm_stringutil.h"
#include "Logger.h"
#include "TimerSys.h"
@@ -59,6 +58,9 @@
#endif
#include <amtl/os/am-shared-library.h>
#include <amtl/os/am-path.h>
#include <bridge/include/IVEngineServerBridge.h>
#include <bridge/include/IPlayerInfoBridge.h>
#include <bridge/include/IFileSystemBridge.h>
#if defined _WIN32
# define MATCHMAKINGDS_SUFFIX ""
@@ -297,17 +299,15 @@ static const char* get_core_config_value(const char* key)
return g_CoreConfig.GetCoreConfigValue(key);
}
static DatabaseInfo keyvalues_to_dbinfo(KeyValues *kv)
static void keyvalues_to_dbinfo(KeyValues *kv, DatabaseInfo *out)
{
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;
out->database = kv->GetString("database", "");
out->driver = kv->GetString("driver", "default");
out->host = kv->GetString("host", "");
out->maxTimeout = kv->GetInt("timeout", 0);
out->pass = kv->GetString("pass", "");
out->port = kv->GetInt("port", 0);
out->user = kv->GetString("user", "");
}
static int get_activity_flags()