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

- renamed variables in handle_se00.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-31 22:55:41 +01:00
parent e9d6fb2bb5
commit a37cfe2913
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2605,10 +2605,10 @@ void scrap(DDukeActor* actor, int SCRAP1, int SCRAP6)
void handle_se00(int i, int LASERLINE) void handle_se00(int i, int LASERLINE)
{ {
auto s = &sprite[i]; auto s = &sprite[i];
auto ht = &hittype[i]; auto actor = &hittype[i];
int sect = s->sectnum; int sectno = s->sectnum;
auto t = &ht->temp_data[0]; auto t = &actor->temp_data[0];
sectortype *sc = &sector[s->sectnum]; sectortype *sect = &sector[s->sectnum];
int st = s->lotag; int st = s->lotag;
int sh = s->hitag; int sh = s->hitag;
@ -2623,67 +2623,67 @@ void handle_se00(int i, int LASERLINE)
return; return;
} }
int q = sc->extra >> 3; int q = sect->extra >> 3;
int l = 0; int l = 0;
if (sc->lotag == 30) if (sect->lotag == 30)
{ {
q >>= 2; q >>= 2;
if (sprite[i].extra == 1) if (sprite[i].extra == 1)
{ {
if (ht->tempang < 256) if (actor->tempang < 256)
{ {
ht->tempang += 4; actor->tempang += 4;
if (ht->tempang >= 256) if (actor->tempang >= 256)
callsound(s->sectnum, i); callsound(s->sectnum, i);
if (s->clipdist) l = 1; if (s->clipdist) l = 1;
else l = -1; else l = -1;
} }
else ht->tempang = 256; else actor->tempang = 256;
if (sc->floorz > s->z) //z's are touching if (sect->floorz > s->z) //z's are touching
{ {
sc->floorz -= 512; sect->floorz -= 512;
zchange = -512; zchange = -512;
if (sc->floorz < s->z) if (sect->floorz < s->z)
sc->floorz = s->z; sect->floorz = s->z;
} }
else if (sc->floorz < s->z) //z's are touching else if (sect->floorz < s->z) //z's are touching
{ {
sc->floorz += 512; sect->floorz += 512;
zchange = 512; zchange = 512;
if (sc->floorz > s->z) if (sect->floorz > s->z)
sc->floorz = s->z; sect->floorz = s->z;
} }
} }
else if (sprite[i].extra == 3) else if (sprite[i].extra == 3)
{ {
if (ht->tempang > 0) if (actor->tempang > 0)
{ {
ht->tempang -= 4; actor->tempang -= 4;
if (ht->tempang <= 0) if (actor->tempang <= 0)
callsound(s->sectnum, i); callsound(s->sectnum, i);
if (s->clipdist) l = -1; if (s->clipdist) l = -1;
else l = 1; else l = 1;
} }
else ht->tempang = 0; else actor->tempang = 0;
if (sc->floorz > ht->temp_data[3]) //z's are touching if (sect->floorz > actor->temp_data[3]) //z's are touching
{ {
sc->floorz -= 512; sect->floorz -= 512;
zchange = -512; zchange = -512;
if (sc->floorz < ht->temp_data[3]) if (sect->floorz < actor->temp_data[3])
sc->floorz = ht->temp_data[3]; sect->floorz = actor->temp_data[3];
} }
else if (sc->floorz < ht->temp_data[3]) //z's are touching else if (sect->floorz < actor->temp_data[3]) //z's are touching
{ {
sc->floorz += 512; sect->floorz += 512;
zchange = 512; zchange = 512;
if (sc->floorz > ht->temp_data[3]) if (sect->floorz > actor->temp_data[3])
sc->floorz = ht->temp_data[3]; sect->floorz = actor->temp_data[3];
} }
} }
@ -2711,7 +2711,7 @@ void handle_se00(int i, int LASERLINE)
t[2] += (l * q); t[2] += (l * q);
} }
if (l && (sc->floorstat & 64)) if (l && (sect->floorstat & 64))
{ {
int p; int p;
for (p = connecthead; p >= 0; p = connectpoint2[p]) for (p = connecthead; p >= 0; p = connectpoint2[p])