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

Duke: fixed animated static monitors.

Browse source
This commit is contained in:
Christoph Oelckers 2024-10-09 07:34:44 +02:00
parent 97a71bad5d
commit f5d08416c6
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1912,11 +1912,13 @@ bool checkhitswitch(DDukePlayer* const p, walltype* wwal, DDukeActor* act)
void animatewalls(void) void animatewalls(void)
{ {
static FTextureID noise, ff1, ff2; static FTextureID noise[3], ff1, ff2;
// all that was done here is to open the system up sufficiently to allow replacing the textures being used without having to use ART files. // all that was done here is to open the system up sufficiently to allow replacing the textures being used without having to use ART files.
// Custom animated textures are better done with newly written controller actors. // Custom animated textures are better done with newly written controller actors.
if (!noise.isValid()) noise = TexMan.CheckForTexture("SCREENBREAK6", ETextureType::Any); if (!noise[0].isValid()) noise[0] = TexMan.CheckForTexture("SCREENBREAK6", ETextureType::Any);
if (!noise[1].isValid()) noise[1] = TexMan.CheckForTexture("SCREENBREAK7", ETextureType::Any);
if (!noise[2].isValid()) noise[2] = TexMan.CheckForTexture("SCREENBREAK8", ETextureType::Any);
if (!ff1.isValid()) ff1 = TexMan.CheckForTexture("W_FORCEFIELD", ETextureType::Any); if (!ff1.isValid()) ff1 = TexMan.CheckForTexture("W_FORCEFIELD", ETextureType::Any);
if (!ff2.isValid()) ff2 = TexMan.CheckForTexture("W_FORCEFIELD2", ETextureType::Any); if (!ff2.isValid()) ff2 = TexMan.CheckForTexture("W_FORCEFIELD2", ETextureType::Any);
@ -1942,17 +1944,18 @@ void animatewalls(void)
{ {
if ((krand() & 255) < 16) if ((krand() & 255) < 16)
{ {
wal->setwalltexture(noise); wal->setwalltexture(noise[0]);
} }
} }
else if (tileflags(wal->walltexture) & TFLAG_ANIMSCREENNOISE) else if (tileflags(wal->walltexture) & TFLAG_ANIMSCREENNOISE)
{ {
if (animwall[p].origtex.isValid()) if (animwall[p].origtex.isValid() && !(tileflags(animwall[p].origtex) & TFLAG_ANIMSCREENNOISE))
wal->setwalltexture(animwall[p].origtex); wal->setwalltexture(animwall[p].origtex);
else else
{ {
texid = texid + 1; if (texid == noise[0]) texid = noise[1];
if (texid.GetIndex() > noise.GetIndex() + 3 || texid.GetIndex() < noise.GetIndex()) texid = noise; else if (texid == noise[1]) texid = noise[2];
else if (texid == noise[2]) texid = noise[0];
wal->setwalltexture(texid); wal->setwalltexture(texid);
} }
} }