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

Remove broken TRIGGER_MATCEN check

Browse source 
D1X sets flags to TRIGGER_MATCEN, not type.
This commit is contained in:
Kp 2014-02-08 23:20:29 +00:00
parent ebfb559fe1
commit 766ed23dda
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
similar/main/gamesave.cpp
View file

@ -1187,24 +1187,15 @@ static int load_game_data(PHYSFS_file *LoadFile)
for (t=0; t<Num_triggers; t++) {
int l;
for (l=0; l<Triggers[t].num_links; l++) {
//check to see that if a trigger requires a wall that it has one,
//and if it requires a matcen that it has one
#if defined(DXX_BUILD_DESCENT_II)
int seg_num;
seg_num = Triggers[t].seg[l];
//check to see that if a trigger requires a wall that it has one,
//and if it requires a matcen that it has one
#if defined(DXX_BUILD_DESCENT_I)
if (Triggers[t].type == TRIGGER_MATCEN)
#elif defined(DXX_BUILD_DESCENT_II)
if (Triggers[t].type == TT_MATCEN)
#endif
{
if (Segment2s[seg_num].special != SEGMENT_IS_ROBOTMAKER)
Int3(); //matcen trigger doesn't point to matcen
}
#if defined(DXX_BUILD_DESCENT_II)
else if (Triggers[t].type != TT_LIGHT_OFF && Triggers[t].type != TT_LIGHT_ON) { //light triggers don't require walls
if (Triggers[t].type != TT_LIGHT_OFF && Triggers[t].type != TT_LIGHT_ON) { //light triggers don't require walls
int side_num = Triggers[t].side[l], wall_num = Segments[seg_num].sides[side_num].wall_num;
if (wall_num == -1)
Int3(); // This is illegal. This trigger requires a wall