markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get rid of c++11

Browse source
This commit is contained in:
jeefo 2016-07-04 13:25:12 +03:00
commit 562beb6aa5
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
source/interface.cpp
View file

@ -2962,7 +2962,7 @@ Library *LoadCSBinary (void)
const char *modname = engine.GetModName (); const char *modname = engine.GetModName ();
if (!modname) if (!modname)
return nullptr; return NULL;
#if defined (PLATFORM_WIN32) #if defined (PLATFORM_WIN32)
const char *libs[] = { "mp.dll", "cs.dll" }; const char *libs[] = { "mp.dll", "cs.dll" };
@ -2988,7 +2988,7 @@ Library *LoadCSBinary (void)
g_gameFlags |= GAME_CZERO; g_gameFlags |= GAME_CZERO;
if (g_isMetamod) if (g_isMetamod)
return nullptr; return NULL;
return new Library (path); return new Library (path);
} }
@ -3000,7 +3000,7 @@ Library *LoadCSBinary (void)
if (!game->IsLoaded ()) if (!game->IsLoaded ())
{ {
AddLogEntry (true, LL_FATAL | LL_IGNORE, "Unable to load gamedll \"%s\". Exiting... (gamedir: %s)", libs[i], modname); AddLogEntry (true, LL_FATAL | LL_IGNORE, "Unable to load gamedll \"%s\". Exiting... (gamedir: %s)", libs[i], modname);
return nullptr; return NULL;
} }
// detect xash engine // detect xash engine
@ -3011,15 +3011,15 @@ Library *LoadCSBinary (void)
if (g_isMetamod) if (g_isMetamod)
{ {
delete game; delete game;
return nullptr; return NULL;
} }
return game; return game;
} }
// detect if we're running modern game // detect if we're running modern game
auto entity = game->GetFuncAddr <EntityPtr_t> ("weapon_famas"); EntityPtr_t entity = game->GetFuncAddr <EntityPtr_t> ("weapon_famas");
if (entity != nullptr) if (entity != NULL)
g_gameFlags |= GAME_CSTRIKE16; g_gameFlags |= GAME_CSTRIKE16;
else else
g_gameFlags |= GAME_LEGACY; g_gameFlags |= GAME_LEGACY;
@ -3027,12 +3027,12 @@ Library *LoadCSBinary (void)
if (g_isMetamod) if (g_isMetamod)
{ {
delete game; delete game;
return nullptr; return NULL;
} }
return game; return game;
} }
} }
return nullptr; return NULL;
} }
DLL_GIVEFNPTRSTODLL GiveFnptrsToDll (enginefuncs_t *functionTable, globalvars_t *pGlobals) DLL_GIVEFNPTRSTODLL GiveFnptrsToDll (enginefuncs_t *functionTable, globalvars_t *pGlobals)
@ -3086,7 +3086,7 @@ DLL_GIVEFNPTRSTODLL GiveFnptrsToDll (enginefuncs_t *functionTable, globalvars_t
#else #else
g_gameLib = LoadCSBinary (); g_gameLib = LoadCSBinary ();
{ {
if (g_gameLib == nullptr && !g_isMetamod) if (g_gameLib == NULL && !g_isMetamod)
{ {
AddLogEntry (true, LL_FATAL | LL_IGNORE, "Mod that you has started, not supported by this bot (gamedir: %s)", engine.GetModName ()); AddLogEntry (true, LL_FATAL | LL_IGNORE, "Mod that you has started, not supported by this bot (gamedir: %s)", engine.GetModName ());
return; return;