zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed another one of those stupidly badly designed iterator loops.

Browse source 
Fixes #176.
This commit is contained in:
Christoph Oelckers 2020-08-14 21:49:12 +02:00
parent 52ddac21b0
commit 37ea207d5a
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/games/duke/src/actors_r.cpp
View file

@ -1682,9 +1682,9 @@ void movetransports_r(void)
short i, j, k, p, sect, sectlotag, nexti, nextj; short i, j, k, p, sect, sectlotag, nexti, nextj;
int ll2, ll, onfloorz; int ll2, ll, onfloorz;
i = headspritestat[STAT_TRANSPORT]; //Transporters //Transporters
while (i >= 0) for (i = headspritestat[STAT_TRANSPORT]; i >= 0; i = nexti)
{ {
sect = sprite[i].sectnum; sect = sprite[i].sectnum;
sectlotag = sector[sect].lotag; sectlotag = sector[sect].lotag;
@ -1695,7 +1695,6 @@ void movetransports_r(void)
auto PN = sprite[i].picnum; auto PN = sprite[i].picnum;
if (OW == i) if (OW == i)
{ {
i = nexti;
continue; continue;
} }
@ -1703,8 +1702,7 @@ void movetransports_r(void)
if (hittype[i].temp_data[0] > 0) hittype[i].temp_data[0]--; if (hittype[i].temp_data[0] > 0) hittype[i].temp_data[0]--;
j = headspritesect[sect]; for (j = headspritesect[sect]; j >= 0; j = nextj)
while (j >= 0)
{ {
nextj = nextspritesect[j]; nextj = nextspritesect[j];
@ -1857,7 +1855,7 @@ void movetransports_r(void)
case STAT_ACTOR: case STAT_ACTOR:
if (PN == SHARK || if (PN == SHARK ||
(isRRRA() && (PN == CHEERBOAT || PN == HULKBOAT || PN == MINIONBOAT || PN == UFO1_RRRA)) || (isRRRA() && (PN == CHEERBOAT || PN == HULKBOAT || PN == MINIONBOAT || PN == UFO1_RRRA)) ||
(!isRRRA() && (PN == UFO1_RR || PN == UFO2 || PN == UFO3 || PN == UFO4 || PN == UFO5))) goto JBOLT; (!isRRRA() && (PN == UFO1_RR || PN == UFO2 || PN == UFO3 || PN == UFO4 || PN == UFO5))) continue;
case STAT_PROJECTILE: case STAT_PROJECTILE:
case STAT_MISC: case STAT_MISC:
case STAT_DUMMYPLAYER: case STAT_DUMMYPLAYER:
@ -1923,7 +1921,7 @@ void movetransports_r(void)
case BURNING: case BURNING:
case FIRE: case FIRE:
case MUD: case MUD:
goto JBOLT; continue;
case PLAYERONWATER: case PLAYERONWATER:
if (sectlotag == ST_2_UNDERWATER) if (sectlotag == ST_2_UNDERWATER)
{ {
@ -2058,10 +2056,7 @@ void movetransports_r(void)
break; break;
} }
JBOLT:
j = nextj;
} }
i = nexti;
} }
} }