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

Fix mismerge that doubled up jointlist reading

Browse source 
Commit 616a3a6 improperly brought in both D1X and D2X copies of the same
loop, but it is a bug for the loop to be run twice.  This caused the
game to crash during initialization because the file position was not as
expected and the loader error handling is poor.
This commit is contained in:
Kp 2013-05-09 23:43:33 +00:00
parent e5ab7e85c4
commit e30828a1f6
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
similar/main/robot.c
View file

@ -336,10 +336,6 @@ int robot_info_read_n(robot_info *ri, int n, PHYSFS_file *fp)
for (j = 0; j < MAX_GUNS + 1; j++)
jointlist_read_n(ri[i].anim_states[j], N_ANIM_STATES, fp);
for (j = 0; j < MAX_GUNS + 1; j++)
jointlist_read_n(ri[i].anim_states[j], N_ANIM_STATES, fp);
ri[i].always_0xabcd = PHYSFSX_readInt(fp);
}
return i;