From c0a40cb7d7118c504380a614bc4ed891e7cba425 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Wed, 19 Jan 2022 10:05:41 +0100
Subject: [PATCH] - renamed RR's TRIPBOMBSPRITE to POWDERKEG

---
 source/games/duke/src/animatesprites_r.cpp | 4 ++--
 source/games/duke/src/flags_r.cpp          | 2 +-
 source/games/duke/src/namelist_r.h         | 2 +-
 source/games/duke/src/player_r.cpp         | 6 +++---
 source/games/duke/src/spawn_r.cpp          | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/games/duke/src/animatesprites_r.cpp b/source/games/duke/src/animatesprites_r.cpp
index 3282d2824..7da14cf72 100644
--- a/source/games/duke/src/animatesprites_r.cpp
+++ b/source/games/duke/src/animatesprites_r.cpp
@@ -195,7 +195,7 @@ void animatesprites_r(tspritetype* tsprite, int& spritesortcnt, int x, int y, in
 		case MONEY:
 		case MONEY + 1:
 			break;
-		case TRIPBOMBSPRITE:
+		case POWDERKEG:
 			continue;
 		case FORCESPHERE:
 			if (t->statnum == STAT_MISC && OwnerAc)
@@ -390,7 +390,7 @@ void animatesprites_r(tspritetype* tsprite, int& spritesortcnt, int x, int y, in
 				case CHICKEN_WEAPON:        newtspr->picnum = RPGSPRITE; break;
 				case THROWINGDYNAMITE_WEAPON:
 				case DYNAMITE_WEAPON:    newtspr->picnum = HEAVYHBOMB;           break;
-				case POWDERKEG_WEAPON:    newtspr->picnum = TRIPBOMBSPRITE;       break;
+				case POWDERKEG_WEAPON:    newtspr->picnum = POWDERKEG;       break;
 				case BOWLING_WEAPON:     newtspr->picnum = 3437;                 break;
 				case THROWSAW_WEAPON:    newtspr->picnum = SHRINKSPARK;          break;
 				case BUZZSAW_WEAPON:        newtspr->picnum = SHRINKSPARK;          break;
diff --git a/source/games/duke/src/flags_r.cpp b/source/games/duke/src/flags_r.cpp
index 08d8b42da..246f1cb26 100644
--- a/source/games/duke/src/flags_r.cpp
+++ b/source/games/duke/src/flags_r.cpp
@@ -230,7 +230,7 @@ void initactorflags_r()
 
 	setflag(SFLAG_NOINTERPOLATE, { CRANEPOLE });
 	setflag(SFLAG_FALLINGFLAMMABLE, { BOX });
-	setflag(SFLAG_INFLAME, { RADIUSEXPLOSION, RPG, FIRELASER, HYDRENT, HEAVYHBOMB, TRIPBOMBSPRITE, COOLEXPLOSION1, OWHIP, UWHIP });
+	setflag(SFLAG_INFLAME, { RADIUSEXPLOSION, RPG, FIRELASER, HYDRENT, HEAVYHBOMB, POWDERKEG, COOLEXPLOSION1, OWHIP, UWHIP });
 	if (isRRRA()) setflag(SFLAG_INFLAME, { RPG2 });
 	setflag(SFLAG_NOFLOORFIRE, { TREE1, TREE2 });
 	setflag(SFLAG_HITRADIUS_FLAG1, { BOX, TREE1, TREE2, TIRE });
diff --git a/source/games/duke/src/namelist_r.h b/source/games/duke/src/namelist_r.h
index ba18a3af0..b8c15450b 100644
--- a/source/games/duke/src/namelist_r.h
+++ b/source/games/duke/src/namelist_r.h
@@ -13,7 +13,7 @@ x(RPGSPRITE, 23)
 x(FREEZESPRITE, 24)
 x(SHRINKERSPRITE, 25)
 x(HEAVYHBOMB, 26)
-x(TRIPBOMBSPRITE, 27)
+x(POWDERKEG, 27)
 x(SHOTGUNSPRITE, 28)
 x(DEVISTATORSPRITE, 29)
 x(HEALTHBOX, 30)
diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp
index da6582f08..1dadf5e64 100644
--- a/source/games/duke/src/player_r.cpp
+++ b/source/games/duke/src/player_r.cpp
@@ -891,7 +891,7 @@ void shoot_r(DDukeActor* actor, int atwith)
 		shootweapon(actor, p, sx, sy, sz, sa, atwith);
 		return;
 
-	case TRIPBOMBSPRITE:
+	case POWDERKEG:
 	{
 		auto j = spawn(actor, atwith);
 		if (j)
@@ -1495,7 +1495,7 @@ void checkweapons_r(struct player_struct* p)
 {
 	static const uint16_t weapon_sprites[MAX_WEAPONS] = { KNEE, FIRSTGUNSPRITE, SHOTGUNSPRITE,
 			CHAINGUNSPRITE, RPGSPRITE, HEAVYHBOMB, SHRINKERSPRITE, DEVISTATORSPRITE,
-			TRIPBOMBSPRITE, BOWLINGBALLSPRITE, FREEZEBLAST, HEAVYHBOMB };
+			POWDERKEG, BOWLINGBALLSPRITE, FREEZEBLAST, HEAVYHBOMB };
 
 	if (isRRRA())
 	{
@@ -3162,7 +3162,7 @@ static void operateweapon(int snum, ESyncBits actions, sectortype* psectp)
 			EGS(p->cursector,
 				p->pos.X + p->angle.ang.bcos(-6),
 				p->pos.Y + p->angle.ang.bsin(-6),
-				p->pos.Z, TRIPBOMBSPRITE, -16, 9, 9,
+				p->pos.Z, POWDERKEG, -16, 9, 9,
 				p->angle.ang.asbuild(), k * 2, i, pact, 1);
 		}
 		p->kickback_pic++;
diff --git a/source/games/duke/src/spawn_r.cpp b/source/games/duke/src/spawn_r.cpp
index bb518096d..4630fe091 100644
--- a/source/games/duke/src/spawn_r.cpp
+++ b/source/games/duke/src/spawn_r.cpp
@@ -1123,7 +1123,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 	case HEATSENSOR:
 	case SHIELD:
 	case AIRTANK:
-	case TRIPBOMBSPRITE:
+	case POWDERKEG:
 	case COWPIE:
 	case HOLODUKE:
 
@@ -1275,7 +1275,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 			act->spr.xrepeat = 11;
 			act->spr.yrepeat = 11;
 			break;
-		case TRIPBOMBSPRITE:
+		case POWDERKEG:
 			act->spr.xrepeat = 11;
 			act->spr.yrepeat = 11;
 			act->spr.yvel = 4;