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

- renaming in movemasterswitch and detonate.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-24 22:23:12 +02:00
parent 38e0ac1e3f
commit 89d750c94f
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
source/games/duke/src/actors.cpp
View file

@ -929,8 +929,8 @@ void moveflammable(DDukeActor* actor, int tire, int box, int pool)
void detonate(int i, int explosion) void detonate(int i, int explosion)
{ {
auto s = &sprite[i]; auto spri = &sprite[i];
auto ht = &hittype[i]; auto actor = &hittype[i];
auto t = &hittype[i].temp_data[0]; auto t = &hittype[i].temp_data[0];
earthquaketime = 16; earthquaketime = 16;
@ -939,38 +939,38 @@ void detonate(int i, int explosion)
while ((j = itj.NextIndex()) >= 0) while ((j = itj.NextIndex()) >= 0)
{ {
auto sj = &sprite[j]; auto sj = &sprite[j];
auto htj = &hittype[j]; auto effector = &hittype[j];
if (s->hitag == sj->hitag) if (spri->hitag == sj->hitag)
{ {
if (sj->lotag == SE_13_EXPLOSIVE) if (sj->lotag == SE_13_EXPLOSIVE)
{ {
if (htj->temp_data[2] == 0) if (effector->temp_data[2] == 0)
htj->temp_data[2] = 1; effector->temp_data[2] = 1;
} }
else if (sj->lotag == SE_8_UP_OPEN_DOOR_LIGHTS) else if (sj->lotag == SE_8_UP_OPEN_DOOR_LIGHTS)
htj->temp_data[4] = 1; effector->temp_data[4] = 1;
else if (sj->lotag == SE_18_INCREMENTAL_SECTOR_RISE_FALL) else if (sj->lotag == SE_18_INCREMENTAL_SECTOR_RISE_FALL)
{ {
if (htj->temp_data[0] == 0) if (effector->temp_data[0] == 0)
htj->temp_data[0] = 1; effector->temp_data[0] = 1;
} }
else if (sj->lotag == SE_21_DROP_FLOOR) else if (sj->lotag == SE_21_DROP_FLOOR)
htj->temp_data[0] = 1; effector->temp_data[0] = 1;
} }
} }
s->z -= (32 << 8); spri->z -= (32 << 8);
if ((t[3] == 1 && s->xrepeat) || s->lotag == -99) if ((t[3] == 1 && spri->xrepeat) || spri->lotag == -99)
{ {
int x = s->extra; int x = spri->extra;
fi.spawn(i, explosion); fi.spawn(i, explosion);
fi.hitradius(i, seenineblastradius, x >> 2, x - (x >> 1), x - (x >> 2), x); fi.hitradius(i, seenineblastradius, x >> 2, x - (x >> 1), x - (x >> 2), x);
S_PlayActorSound(PIPEBOMB_EXPLODE, i); S_PlayActorSound(PIPEBOMB_EXPLODE, i);
} }
if (s->xrepeat) if (spri->xrepeat)
for (int x = 0; x < 8; x++) RANDOMSCRAP(s, i); for (int x = 0; x < 8; x++) RANDOMSCRAP(spri, i);
deletesprite(i); deletesprite(i);
@ -984,16 +984,16 @@ void detonate(int i, int explosion)
void movemasterswitch(int i, int spectype1, int spectype2) void movemasterswitch(int i, int spectype1, int spectype2)
{ {
auto s = &sprite[i]; auto spri = &sprite[i];
auto t = &hittype[i].temp_data[0]; auto t = &hittype[i].temp_data[0];
if (s->yvel == 1) if (spri->yvel == 1)
{ {
s->hitag--; spri->hitag--;
if (s->hitag <= 0) if (spri->hitag <= 0)
{ {
operatesectors(s->sectnum, i); operatesectors(spri->sectnum, i);
SectIterator it(s->sectnum); SectIterator it(spri->sectnum);
int j; int j;
while ((j = it.NextIndex()) >= 0) while ((j = it.NextIndex()) >= 0)
{ {