- RR: stop the bowling pins' tumbling animation when they come to a r…

…est. Fixes an original RR bug.
ZDoom · Jan 8, 2023 · 532f994 · 532f994
1 parent ff33dd7
commit 532f994
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -3,7 +3,7 @@ class RedneckBowlingPin : DukeActor
 	default
 	{
 		RedneckBowlingPin.Behavior 0;
-		spriteset "BOWLINGPIN", "BOWLINGPIN1";
+		spriteset "BOWLINGPIN", "BOWLINGPIN1", "BOWLINGPIN2";
 	}
 
 	meta int behavior;
@@ -65,13 +65,18 @@ class RedneckBowlingPin : DukeActor
 			}
 			if (type < 2 && self.vel.X == 0)
 			{
+				if (type == 0 && self.spritesetindex == 1) self.setSpritesetImage(2);
 				return;
 			}
 		}
 		else if (self.sector.lotag == 900 && type != 2)
 		{
 			self.Destroy();
 		}
+		else
+		{
+			if (type == 0 && self.spritesetindex == 1) self.setSpritesetImage(2);
+		}
 	}
 
 	override void Tick()