zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed some messed up conditionals in RR's switch code.

Browse source 
Fixes #166
This commit is contained in:
Christoph Oelckers 2020-08-12 00:31:04 +02:00
parent 83796e9eed
commit cbfa8abd34
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
source/games/duke/src/sectors_r.cpp
View file

@ -346,8 +346,8 @@ void operateforcefields_r(int s, int low)
bool checkhitswitch_r(int snum, int w, int switchtype) bool checkhitswitch_r(int snum, int w, int switchtype)
{ {
char switchpal; uint8_t switchpal;
short i, x, lotag, hitag, picnum, correctdips, numdips; int i, x, lotag, hitag, picnum, correctdips, numdips;
int sx, sy; int sx, sy;
if (w < 0) return 0; if (w < 0) return 0;
@ -429,13 +429,15 @@ bool checkhitswitch_r(int snum, int w, int switchtype)
return 0; return 0;
} }
goto goOn1;
case MULTISWITCH2: case MULTISWITCH2:
case MULTISWITCH2 + 1: case MULTISWITCH2 + 1:
case MULTISWITCH2 + 2: case MULTISWITCH2 + 2:
case MULTISWITCH2 + 3: case MULTISWITCH2 + 3:
case RRTILE8464: case RRTILE8464:
case RRTILE8660: case RRTILE8660:
if (isRRRA()) break; if (!isRRRA()) break;
case DIPSWITCH2: case DIPSWITCH2:
case DIPSWITCH2 + 1: case DIPSWITCH2 + 1:
case DIPSWITCH3: case DIPSWITCH3:
@ -473,6 +475,7 @@ bool checkhitswitch_r(int snum, int w, int switchtype)
case RRTILE2697 + 1: case RRTILE2697 + 1:
case RRTILE2707: case RRTILE2707:
case RRTILE2707 + 1: case RRTILE2707 + 1:
goOn1:
if (check_activator_motion(lotag)) return 0; if (check_activator_motion(lotag)) return 0;
break; break;
default: default:
@ -708,6 +711,7 @@ bool checkhitswitch_r(int snum, int w, int switchtype)
if (numdips != correctdips) break; if (numdips != correctdips) break;
S_PlaySound3D(END_OF_LEVEL_WARN, ps[snum].i, &v); S_PlaySound3D(END_OF_LEVEL_WARN, ps[snum].i, &v);
} }
goto goOn2;
case MULTISWITCH2: case MULTISWITCH2:
case MULTISWITCH2 + 1: case MULTISWITCH2 + 1:
case MULTISWITCH2 + 2: case MULTISWITCH2 + 2:
@ -751,6 +755,7 @@ bool checkhitswitch_r(int snum, int w, int switchtype)
case RRTILE2697 + 1: case RRTILE2697 + 1:
case RRTILE2707: case RRTILE2707:
case RRTILE2707 + 1: case RRTILE2707 + 1:
goOn2:
if (isRRRA()) if (isRRRA())
{ {
if (picnum == RRTILE8660) if (picnum == RRTILE8660)
@ -823,7 +828,7 @@ bool checkhitswitch_r(int snum, int w, int switchtype)
lotag += picnum - MULTISWITCH2; lotag += picnum - MULTISWITCH2;
} }
x = headspritestat[3]; x = headspritestat[STAT_EFFECTOR];
while (x >= 0) while (x >= 0)
{ {
if (sprite[x].hitag == lotag) if (sprite[x].hitag == lotag)
@ -831,25 +836,25 @@ bool checkhitswitch_r(int snum, int w, int switchtype)
switch (sprite[x].lotag) switch (sprite[x].lotag)
{ {
case 46: case 46:
case 47: case SE_47_LIGHT_SWITCH:
case 48: case SE_48_LIGHT_SWITCH:
if (!isRRRA()) break; if (!isRRRA()) break;
case 12: case SE_12_LIGHT_SWITCH:
sector[sprite[x].sectnum].floorpal = 0; sector[sprite[x].sectnum].floorpal = 0;
hittype[x].temp_data[0]++; hittype[x].temp_data[0]++;
if (hittype[x].temp_data[0] == 2) if (hittype[x].temp_data[0] == 2)
hittype[x].temp_data[0]++; hittype[x].temp_data[0]++;
break; break;
case 24: case SE_24_CONVEYOR:
case 34: case SE_34:
case 25: case SE_25_PISTON:
hittype[x].temp_data[4] = !hittype[x].temp_data[4]; hittype[x].temp_data[4] = !hittype[x].temp_data[4];
if (hittype[x].temp_data[4]) if (hittype[x].temp_data[4])
FTA(15, &ps[snum]); FTA(15, &ps[snum]);
else FTA(2, &ps[snum]); else FTA(2, &ps[snum]);
break; break;
case 21: case SE_21_DROP_FLOOR:
FTA(2, &ps[screenpeek]); FTA(2, &ps[screenpeek]);
break; break;
} }