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

Eliminate need for gEntList gamedata on tf2/sdk2013 and soon dods/css/hl2dm.

Browse Source
This commit is contained in:
Nicholas Hastings 2014-10-30 19:23:27 -04:00
parent 5d78a5ff93
commit 350dd2ebc7
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/HalfLife2.cpp
View File

@ -153,6 +153,18 @@ void CHalfLife2::OnSourceModAllInitialized_Post()
void CHalfLife2::InitLogicalEntData() void CHalfLife2::InitLogicalEntData()
{ {
#if SOURCE_ENGINE == SE_TF2 \
|| SOURCE_ENGINE == SE_DODS \
|| SOURCE_ENGINE == SE_HL2DM \
|| SOURCE_ENGINE == SE_CSS \
|| SOURCE_ENGINE == SE_SDK2013
if (g_SMAPI->GetServerFactory(false)("VSERVERTOOLS003", nullptr))
{
g_EntList = servertools->GetEntityList();
}
#endif
char *addr = NULL; char *addr = NULL;
/* /*
@ -162,21 +174,24 @@ void CHalfLife2::InitLogicalEntData()
* If symbols aren't present (Windows or stripped Linux/Mac), * If symbols aren't present (Windows or stripped Linux/Mac),
* attempt find via LevelShutdown + offset * attempt find via LevelShutdown + offset
*/ */
if (g_pGameConf->GetMemSig("gEntList", (void **)&addr)) if (!g_EntList)
{ {
#if !defined PLATFORM_WINDOWS if (g_pGameConf->GetMemSig("gEntList", (void **) &addr))
if (!addr)
{ {
// Key exists so notify if lookup fails, but try other method.
logger->LogError("Failed lookup of gEntList directly - Reverting to lookup via LevelShutdown");
}
else
{
#endif
g_EntList = reinterpret_cast<void *>(addr);
#if !defined PLATFORM_WINDOWS #if !defined PLATFORM_WINDOWS
} if (!addr)
{
// Key exists so notify if lookup fails, but try other method.
logger->LogError("Failed lookup of gEntList directly - Reverting to lookup via LevelShutdown");
}
else
{
#endif #endif
g_EntList = reinterpret_cast<void *>(addr);
#if !defined PLATFORM_WINDOWS
}
#endif
}
} }
if (!g_EntList) if (!g_EntList)