team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

try to fix an issue with r_r2g with the grenade model not precached. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4566 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-12-12 12:39:34 +00:00
parent 9d10c167b6
commit 7ac2fd1b39
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/client/cl_ents.c
View File

@ -3297,10 +3297,9 @@ void CL_LinkPacketEntities (void)
ent->keynum = state->number;
if (cl_r2g.value && state->modelindex == cl_rocketindex && cl_rocketindex && cl_grenadeindex)
ent->model = cl.model_precache[cl_grenadeindex];
else
ent->model = model;
if (cl_r2g.value && state->modelindex == cl_rocketindex && cl_rocketindex != -1 && cl_grenadeindex != -1)
model = cl.model_precache[cl_grenadeindex];
ent->model = model;
ent->flags = 0;
if (state->dpflags & RENDER_VIEWMODEL)
@ -3410,7 +3409,7 @@ void CL_LinkPacketEntities (void)
}
#ifdef RAGDOLL
if (ent->model->dollinfo)
if (model && model->dollinfo)
rag_updatedeltaent(ent, le);
#endif