TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Relax assert that fails for D1 v1.0 POF

Browse source 
Zico reports that D1 v1.0 game data fails Assert(id < r->n_guns).  Relax
the assertion to avoid the failure.
This commit is contained in:
Kp 2014-08-24 18:30:25 +00:00
parent 94550355a8
commit 765b8fc0b1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
similar/main/polyobj.cpp
View file

@ -346,7 +346,12 @@ static polymodel *read_model_file(polymodel *pm,const char *filename,robot_info
int id;
id = pof_read_short(model_buf);
Assert(id < r->n_guns);
/*
* D1 v1.0 boss02.pof has id=4 and r->n_guns==4.
* Relax the assert to check only for memory
* corruption.
*/
Assert(id < sizeof(r->gun_submodels) / sizeof(r->gun_submodels[0]));
r->gun_submodels[id] = pof_read_short(model_buf);
Assert(r->gun_submodels[id] != 0xff);
pof_read_vecs(&r->gun_points[id],1,model_buf);