reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2024-12-28 15:45:46 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #304 from In-line/SetCStrikeFlags_on_server_init

Browse Source 
SetCStrikeFlags() once on server start
This commit is contained in:
theAsmodai 2017-01-06 21:34:36 +03:00 committed by GitHub
commit fd8bc60daf
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rehlds/engine/cmd.cpp
View File

@ -458,8 +458,9 @@ void Cmd_Alias_f(void)
return; return;
} }
SetCStrikeFlags(); // TODO: Do this once somewhere at the server start #ifndef REHLDS_FIXES
SetCStrikeFlags(); // DONE: Do this once somewhere at the server start
#endif
if ((g_bIsCStrike || g_bIsCZero) && if ((g_bIsCStrike || g_bIsCZero) &&
(!Q_stricmp(s, "cl_autobuy") (!Q_stricmp(s, "cl_autobuy")
|| !Q_stricmp(s, "cl_rebuy") || !Q_stricmp(s, "cl_rebuy")

4
rehlds/engine/host_cmd.cpp
View File

@ -219,6 +219,10 @@ void Host_InitializeGameDLL(void)
SV_CheckBlendingInterface(); SV_CheckBlendingInterface();
SV_CheckSaveGameCommentInterface(); SV_CheckSaveGameCommentInterface();
Cbuf_Execute(); Cbuf_Execute();
#ifdef REHLDS_FIXES // DONE: Set cstrike flags on server start
SetCStrikeFlags();
#endif
} }
void Host_Motd_f(void) void Host_Motd_f(void)

3
rehlds/engine/model.cpp
View File

@ -310,8 +310,9 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean trackCRC)
{ {
p->firstCRCDone = 1; p->firstCRCDone = 1;
p->initialCRC = currentCRC; p->initialCRC = currentCRC;
#ifndef REHLDS_FIXES
SetCStrikeFlags(); SetCStrikeFlags();
#endif
if (!IsGameSubscribed("czero") && g_bIsCStrike && IsCZPlayerModel(currentCRC, mod->name) && g_pcls.state) if (!IsGameSubscribed("czero") && g_bIsCStrike && IsCZPlayerModel(currentCRC, mod->name) && g_pcls.state)
{ {
COM_ExplainDisconnection(TRUE, "Cannot continue with altered model %s, disconnecting.", mod->name); COM_ExplainDisconnection(TRUE, "Cannot continue with altered model %s, disconnecting.", mod->name);

4
rehlds/engine/sv_main.cpp
View File

@ -5746,7 +5746,9 @@ void EXT_FUNC SV_ActivateServer_internal(int runPhysics)
msg.cursize = 0; msg.cursize = 0;
msg.flags = SIZEBUF_CHECK_OVERFLOW; msg.flags = SIZEBUF_CHECK_OVERFLOW;
#ifndef REHLDS_FIXES
SetCStrikeFlags(); SetCStrikeFlags();
#endif
Cvar_Set("sv_newunit", "0"); Cvar_Set("sv_newunit", "0");
ContinueLoadingProgressBar("Server", 8, 0.0f); ContinueLoadingProgressBar("Server", 8, 0.0f);
@ -8044,4 +8046,4 @@ NOXREF qboolean BIsValveGame(void)
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }