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

- animatewalls_r

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-17 23:06:28 +01:00
parent 530c29973e
commit 6d4365f3a2
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -198,23 +198,23 @@ bool isablockdoor(int dapic)
void animatewalls_r(void) void animatewalls_r(void)
{ {
int i, j, p, t; int t;
if (isRRRA() &&ps[screenpeek].sea_sick_stat == 1) if (isRRRA() &&ps[screenpeek].sea_sick_stat == 1)
{ {
for (i = 0; i < MAXWALLS; i++) for (auto& wal : walls())
{ {
if (wall[i].picnum == RRTILE7873) if (wal.picnum == RRTILE7873)
wall[i].addxpan(6); wal.addxpan(6);
else if (wall[i].picnum == RRTILE7870) else if (wal.picnum == RRTILE7870)
wall[i].addxpan(6); wal.addxpan(6);
} }
} }
for (p = 0; p < numanimwalls; p++) for (int p = 0; p < numanimwalls; p++)
{ {
i = animwall[p].wallnum; auto wal = &wall[animwall[p].wallnum];
j = wall[i].picnum; int j = wal->picnum;
switch (j) switch (j)
{ {
@ -232,8 +232,8 @@ void animatewalls_r(void)
if ((krand() & 255) < 16) if ((krand() & 255) < 16)
{ {
animwall[p].tag = wall[i].picnum; animwall[p].tag = wal->picnum;
wall[i].picnum = SCREENBREAK6; wal->picnum = SCREENBREAK6;
} }
continue; continue;
@ -243,19 +243,19 @@ void animatewalls_r(void)
case SCREENBREAK8: case SCREENBREAK8:
if (animwall[p].tag >= 0) if (animwall[p].tag >= 0)
wall[i].picnum = animwall[p].tag; wal->picnum = animwall[p].tag;
else else
{ {
wall[i].picnum++; wal->picnum++;
if (wall[i].picnum == (SCREENBREAK6 + 3)) if (wal->picnum == (SCREENBREAK6 + 3))
wall[i].picnum = SCREENBREAK6; wal->picnum = SCREENBREAK6;
} }
continue; continue;
} }
if (wall[i].cstat & 16) if (wal->cstat & 16)
switch (wall[i].overpicnum) switch (wal->overpicnum)
{ {
case W_FORCEFIELD: case W_FORCEFIELD:
case W_FORCEFIELD + 1: case W_FORCEFIELD + 1:
@ -263,14 +263,14 @@ void animatewalls_r(void)
t = animwall[p].tag; t = animwall[p].tag;
if (wall[i].cstat & 254) if (wal->cstat & 254)
{ {
wall[i].addxpan(-t / 4096.f); // bcos(t, -12); wal->addxpan(-t / 4096.f); // bcos(t, -12);
wall[i].addypan(-t / 4096.f); // bsin(t, -12); wal->addypan(-t / 4096.f); // bsin(t, -12);
if (wall[i].extra == 1) if (wal->extra == 1)
{ {
wall[i].extra = 0; wal->extra = 0;
animwall[p].tag = 0; animwall[p].tag = 0;
} }
else else
@ -279,14 +279,14 @@ void animatewalls_r(void)
if (animwall[p].tag < (128 << 4)) if (animwall[p].tag < (128 << 4))
{ {
if (animwall[p].tag & 128) if (animwall[p].tag & 128)
wall[i].overpicnum = W_FORCEFIELD; wal->overpicnum = W_FORCEFIELD;
else wall[i].overpicnum = W_FORCEFIELD + 1; else wal->overpicnum = W_FORCEFIELD + 1;
} }
else else
{ {
if ((krand() & 255) < 32) if ((krand() & 255) < 32)
animwall[p].tag = 128 << (krand() & 3); animwall[p].tag = 128 << (krand() & 3);
else wall[i].overpicnum = W_FORCEFIELD + 1; else wal->overpicnum = W_FORCEFIELD + 1;
} }
} }