reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-03 18:45:46 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #273 from WPMGPRoSToTeMa/master

Browse Source 
Fixed has_force_unmodified wasn't reset sometimes
This commit is contained in:
LevShisterov 2016-12-10 21:58:01 +05:00 committed by GitHub
commit 88cb7b56f0
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rehlds/engine/sv_main.cpp
View File

@ -307,7 +307,7 @@ cvar_t syserror_logfile = { "syserror_logfile", "sys_error.log", 0, 0.0f, nullpt
cvar_t sv_rehlds_hull_centering = { "sv_rehlds_hull_centering", "0", 0, 0.0f, nullptr }; cvar_t sv_rehlds_hull_centering = { "sv_rehlds_hull_centering", "0", 0, 0.0f, nullptr };
cvar_t sv_rcon_condebug = { "sv_rcon_condebug", "1", 0, 1.0f, nullptr }; cvar_t sv_rcon_condebug = { "sv_rcon_condebug", "1", 0, 1.0f, nullptr };
cvar_t sv_rehlds_userinfo_transmitted_fields = { "sv_rehlds_userinfo_transmitted_fields", "", 0, 0.0f, nullptr }; cvar_t sv_rehlds_userinfo_transmitted_fields = { "sv_rehlds_userinfo_transmitted_fields", "", 0, 0.0f, nullptr };
cvar_t sv_rehlds_attachedentities_playeranimationspeed_fix = {"sv_rehlds_attachedentities_playeranimationspeed_fix", "", 0, 0.0f, nullptr}; cvar_t sv_rehlds_attachedentities_playeranimationspeed_fix = {"sv_rehlds_attachedentities_playeranimationspeed_fix", "0", 0, 0.0f, nullptr};
#endif #endif
delta_t *SV_LookupDelta(char *name) delta_t *SV_LookupDelta(char *name)
@ -4572,6 +4572,8 @@ void SV_WriteEntitiesToClient(client_t *client, sizebuf_t *msg)
{ {
if (attachedEntCount[entityState.number] != 0) if (attachedEntCount[entityState.number] != 0)
{ {
// Each attached entity causes StudioProcessGait for player
// But this will slow down normal animation predicting on client
entityState.framerate /= (1 + attachedEntCount[entityState.number]); entityState.framerate /= (1 + attachedEntCount[entityState.number]);
} }
} }

7
rehlds/engine/sv_user.cpp
View File

@ -234,6 +234,7 @@ void SV_ParseConsistencyResponse(client_t *pSenderClient)
SV_ClientPrintf("%s", dropmessage); SV_ClientPrintf("%s", dropmessage);
SV_DropClient(host_client, FALSE, "Bad file %s", g_rehlds_sv.resources[c - 1].szFileName); // only filename. reason was printed in console if exists. SV_DropClient(host_client, FALSE, "Bad file %s", g_rehlds_sv.resources[c - 1].szFileName); // only filename. reason was printed in console if exists.
return;
} }
#else // REHLDS_FIXES #else // REHLDS_FIXES
if (gEntityInterface.pfnInconsistentFile(host_client->edict, g_psv.resourcelist[c - 1].szFileName, dropmessage)) if (gEntityInterface.pfnInconsistentFile(host_client->edict, g_psv.resourcelist[c - 1].szFileName, dropmessage))
@ -243,12 +244,12 @@ void SV_ParseConsistencyResponse(client_t *pSenderClient)
SV_DropClient(host_client, FALSE, "Bad file %s", dropmessage); SV_DropClient(host_client, FALSE, "Bad file %s", dropmessage);
} }
#endif // REHLDS_FIXES
return; return;
#endif // REHLDS_FIXES
} }
host_client->has_force_unmodified = 0; // Reset has_force_unmodified if we have received response from the client
host_client->has_force_unmodified = FALSE;
} }
qboolean EXT_FUNC SV_FileInConsistencyList(const char *filename, consistency_t **ppconsist) qboolean EXT_FUNC SV_FileInConsistencyList(const char *filename, consistency_t **ppconsist)

2
rehlds/engine/world.cpp
View File

@ -1237,7 +1237,7 @@ void SV_ClipToLinks(areanode_t *node, moveclip_t *clip)
if (trace.allsolid || trace.startsolid || trace.fraction < clip->trace.fraction) if (trace.allsolid || trace.startsolid || trace.fraction < clip->trace.fraction)
{ {
int oldStartSolid = clip->trace.startsolid; qboolean oldStartSolid = clip->trace.startsolid;
trace.ent = touch; trace.ent = touch;
clip->trace = trace; clip->trace = trace;
if (oldStartSolid) if (oldStartSolid)