From 532f994ccb3654804fbd32a8122a8b5c7a580a11 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 8 Jan 2023 18:46:42 +0100 Subject: [PATCH] - RR: stop the bowling pins' tumbling animation when they come to a rest. Fixes an original RR bug. --- source/games/duke/src/namelist_r.h | 1 + wadsrc/static/zscript/games/duke/actors/bowling.zs | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/source/games/duke/src/namelist_r.h b/source/games/duke/src/namelist_r.h index dd70d326a..f965ee293 100644 --- a/source/games/duke/src/namelist_r.h +++ b/source/games/duke/src/namelist_r.h @@ -1031,6 +1031,7 @@ x(BOWLINGBALLSPRITE, 3437) x(POWDERH, 3438) x(BOWLINGPIN, 3440) x(BOWLINGPIN1, 3441) +x(BOWLINGPIN2, 3442) x(DEVISTATOR, 3445) x(RPGGUN, 3452) y(RRTILE3462, 3462) diff --git a/wadsrc/static/zscript/games/duke/actors/bowling.zs b/wadsrc/static/zscript/games/duke/actors/bowling.zs index 1b0a82b21..eeee28c6a 100644 --- a/wadsrc/static/zscript/games/duke/actors/bowling.zs +++ b/wadsrc/static/zscript/games/duke/actors/bowling.zs @@ -3,7 +3,7 @@ class RedneckBowlingPin : DukeActor default { RedneckBowlingPin.Behavior 0; - spriteset "BOWLINGPIN", "BOWLINGPIN1"; + spriteset "BOWLINGPIN", "BOWLINGPIN1", "BOWLINGPIN2"; } meta int behavior; @@ -65,6 +65,7 @@ class RedneckBowlingPin : DukeActor } if (type < 2 && self.vel.X == 0) { + if (type == 0 && self.spritesetindex == 1) self.setSpritesetImage(2); return; } } @@ -72,6 +73,10 @@ class RedneckBowlingPin : DukeActor { self.Destroy(); } + else + { + if (type == 0 && self.spritesetindex == 1) self.setSpritesetImage(2); + } } override void Tick()