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:
parent
9d10c167b6
commit
7ac2fd1b39
1 changed files with 4 additions and 5 deletions
|
@ -3297,9 +3297,8 @@ void CL_LinkPacketEntities (void)
|
||||||
|
|
||||||
ent->keynum = state->number;
|
ent->keynum = state->number;
|
||||||
|
|
||||||
if (cl_r2g.value && state->modelindex == cl_rocketindex && cl_rocketindex && cl_grenadeindex)
|
if (cl_r2g.value && state->modelindex == cl_rocketindex && cl_rocketindex != -1 && cl_grenadeindex != -1)
|
||||||
ent->model = cl.model_precache[cl_grenadeindex];
|
model = cl.model_precache[cl_grenadeindex];
|
||||||
else
|
|
||||||
ent->model = model;
|
ent->model = model;
|
||||||
|
|
||||||
ent->flags = 0;
|
ent->flags = 0;
|
||||||
|
@ -3410,7 +3409,7 @@ void CL_LinkPacketEntities (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef RAGDOLL
|
#ifdef RAGDOLL
|
||||||
if (ent->model->dollinfo)
|
if (model && model->dollinfo)
|
||||||
rag_updatedeltaent(ent, le);
|
rag_updatedeltaent(ent, le);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue