small fix to quake 2 model loading
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2725 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
8482bc2c52
commit
f2bc3029f8
1 changed files with 4 additions and 3 deletions
|
@ -1429,18 +1429,19 @@ void CLQ2_AddPacketEntities (q2frame_t *frame)
|
||||||
if (s1->modelindex == 255)
|
if (s1->modelindex == 255)
|
||||||
{ // use custom player skin
|
{ // use custom player skin
|
||||||
ent.skinnum = 0;
|
ent.skinnum = 0;
|
||||||
ent.model = NULL;
|
|
||||||
|
|
||||||
|
|
||||||
player = &cl.players[s1->skinnum%MAX_CLIENTS];
|
player = &cl.players[s1->skinnum%MAX_CLIENTS];
|
||||||
ent.model = player->model;
|
ent.model = player->model;
|
||||||
if (!ent.model || ent.model->needload) //we need to do better than this
|
if (!ent.model || ent.model->needload) //we need to do better than this
|
||||||
{
|
{
|
||||||
ent.model = Mod_ForName(va("players/%s/tris.md2", Info_ValueForKey(player->userinfo, "model")), false);
|
char *pmodel = Info_ValueForKey(player->userinfo, "model");
|
||||||
|
if (!*pmodel)
|
||||||
|
ent.model = Mod_ForName(va("players/%s/tris.md2", pmodel), false);
|
||||||
if (!ent.model || ent.model->needload)
|
if (!ent.model || ent.model->needload)
|
||||||
ent.model = Mod_ForName("players/male/tris.md2", false);
|
ent.model = Mod_ForName("players/male/tris.md2", false);
|
||||||
}
|
}
|
||||||
ent.scoreboard = player;
|
ent.scoreboard = player;
|
||||||
|
player->model = ent.model;
|
||||||
/* ci = &cl.clientinfo[s1->skinnum & 0xff];
|
/* ci = &cl.clientinfo[s1->skinnum & 0xff];
|
||||||
// ent.skin = ci->skin;
|
// ent.skin = ci->skin;
|
||||||
ent.model = ci->model;
|
ent.model = ci->model;
|
||||||
|
|
Loading…
Reference in a new issue