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

Fix crash when the entity with aiment doesn't have a model

Browse Source
This commit is contained in:
s1lentq 2024-02-14 19:23:16 +07:00
parent a7b60451f3
commit 498d7e0d18
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rehlds/engine/sv_main.cpp
View File

@ -4904,8 +4904,9 @@ void SV_WriteEntitiesToClient(client_t *client, sizebuf_t *msg)
if (entityState.aiment < g_psv.num_edicts) if (entityState.aiment < g_psv.num_edicts)
{ {
edict_t *ent = &g_psv.edicts[entityState.aiment]; edict_t *ent = &g_psv.edicts[entityState.aiment];
if ((ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS) if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS
&& g_psv.models[ent->v.modelindex]->type != mod_studio) && (!g_psv.models[ent->v.modelindex]
|| g_psv.models[ent->v.modelindex]->type != mod_studio))
{ {
entityState.aiment = 0; entityState.aiment = 0;
} }
@ -4915,6 +4916,7 @@ void SV_WriteEntitiesToClient(client_t *client, sizebuf_t *msg)
// Prevent spam "Non-sprite set to glow!" in console on client-side // Prevent spam "Non-sprite set to glow!" in console on client-side
if (entityState.rendermode == kRenderGlow if (entityState.rendermode == kRenderGlow
&& (entityState.modelindex >= 0 && entityState.modelindex < MAX_MODELS) && (entityState.modelindex >= 0 && entityState.modelindex < MAX_MODELS)
&& g_psv.models[entityState.modelindex]
&& g_psv.models[entityState.modelindex]->type != mod_sprite) && g_psv.models[entityState.modelindex]->type != mod_sprite)
{ {
entityState.rendermode = kRenderNormal; entityState.rendermode = kRenderNormal;