teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- pointer replacements.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-28 06:25:08 +01:00
parent 86909c9068
commit 68f9037883
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/games/duke/src/premap_d.cpp
View file

@ -310,29 +310,34 @@ void prelevel_d(int g)
} }
} }
for (i = 0; i < MAXSPRITES; i++) for (i = 0; i < MAXSPRITES; i++)
{ {
if (sprite[i].statnum < MAXSTATUS) auto spr = &sprite[i];
if (spr->statnum < MAXSTATUS)
{ {
if (sprite[i].picnum == SECTOREFFECTOR && sprite[i].lotag == SE_14_SUBWAY_CAR) if (spr->picnum == SECTOREFFECTOR && spr->lotag == SE_14_SUBWAY_CAR)
continue; continue;
fi.spawn(-1, i); fi.spawn(-1, i);
} }
} }
for (i = 0; i < MAXSPRITES; i++) for (i = 0; i < MAXSPRITES; i++)
if (sprite[i].statnum < MAXSTATUS) {
auto spr = &sprite[i];
if (spr->statnum < MAXSTATUS)
{ {
if (sprite[i].picnum == SECTOREFFECTOR && sprite[i].lotag == SE_14_SUBWAY_CAR) if (spr->picnum == SECTOREFFECTOR && spr->lotag == SE_14_SUBWAY_CAR)
fi.spawn(-1, i); fi.spawn(-1, i);
} }
}
lotaglist = 0; lotaglist = 0;
it.Reset(STAT_DEFAULT); it.Reset(STAT_DEFAULT);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
{ {
switch (sprite[i].picnum) auto spr = &sprite[i];
switch (spr->picnum)
{ {
case DIPSWITCH + 1: case DIPSWITCH + 1:
case DIPSWITCH2 + 1: case DIPSWITCH2 + 1:
@ -348,12 +353,12 @@ void prelevel_d(int g)
case LOCKSWITCH1 + 1: case LOCKSWITCH1 + 1:
case POWERSWITCH2 + 1: case POWERSWITCH2 + 1:
for (j = 0; j < lotaglist; j++) for (j = 0; j < lotaglist; j++)
if (sprite[i].lotag == lotags[j]) if (spr->lotag == lotags[j])
break; break;
if (j == lotaglist) if (j == lotaglist)
{ {
lotags[lotaglist] = sprite[i].lotag; lotags[lotaglist] = spr->lotag;
lotaglist++; lotaglist++;
if (lotaglist > 64) if (lotaglist > 64)
I_Error("Too many switches (64 max)."); I_Error("Too many switches (64 max).");
@ -361,7 +366,7 @@ void prelevel_d(int g)
StatIterator it1(STAT_EFFECTOR); StatIterator it1(STAT_EFFECTOR);
while ((j = it1.NextIndex()) >= 0) while ((j = it1.NextIndex()) >= 0)
{ {
if (sprite[j].lotag == 12 && sprite[j].hitag == sprite[i].lotag) if (sprite[j].lotag == 12 && sprite[j].hitag == spr->lotag)
hittype[j].temp_data[0] = 1; hittype[j].temp_data[0] = 1;
} }
} }