Merge pull request #22 from jeefo/develop

fixed cs16-client+xash3d on non-android platforms compatability
This commit is contained in:
jeefo 2016-01-31 16:58:30 +03:00
commit b458c51378
3 changed files with 10 additions and 3 deletions

View file

@ -224,7 +224,7 @@
<OutputFile>.\release\yapb.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DelayLoadDLLs>user32.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>Debug</GenerateDebugInformation>
<GenerateDebugInformation>No</GenerateDebugInformation>
<GenerateMapFile>false</GenerateMapFile>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>false</OptimizeReferences>

View file

@ -1267,8 +1267,6 @@ void Bot::Kick (void)
ServerCommand ("kick \"%s\"", STRING (pev->netname));
CenterPrint ("Bot '%s' kicked", STRING (pev->netname));
pev->flags |= FL_KILLME;
int newBotsNum = bots.GetBotsNum () - 1;
// keep quota number up to date

View file

@ -1050,6 +1050,15 @@ void DetectCSVersion (void)
if (g_gameVersion == CSV_OLD || g_gameVersion == CSV_CZERO)
return;
// detect xash engine
if (g_engfuncs.pfnCVarGetPointer ("build") != NULL)
{
AddLogEntry (true, LL_DEFAULT, "Detected Xash3D Engine. Setting game version to old.");
g_gameVersion = CSV_OLD;
return;
}
// counter-strike 1.6 or higher (plus detects for non-steam versions of 1.5)
byte *detection = (*g_engfuncs.pfnLoadFileForMe) ("events/galil.sc", NULL);