From 49055f1bfd915c2ce4a32c60fd0f1ad0e855af93 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 20 Nov 2022 21:39:56 +0100
Subject: [PATCH] - named a few more of RR's items.

---
 source/games/duke/src/actors_r.cpp | 12 ++++++------
 source/games/duke/src/constants.h  |  1 +
 source/games/duke/src/spawn_r.cpp  |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp
index 9493a2e16..43c5da8ea 100644
--- a/source/games/duke/src/actors_r.cpp
+++ b/source/games/duke/src/actors_r.cpp
@@ -1912,9 +1912,9 @@ void rr_specialstats()
 				DukeStatIterator it2(STAT_DEFAULT);
 				while (auto act2 = it2.Next())
 				{
-					if (act2->spr.picnum == 128)
+					if (act2->spr.picnum == DIPSWITCH3 + 1)
 						if (act2->spr.hitag == 999)
-							act2->spr.picnum = 127;
+							act2->spr.picnum = DIPSWITCH3;
 				}
 			}
 		}
@@ -2034,19 +2034,19 @@ void rr_specialstats()
 			}
 	}
 
-	it.Reset(108);
+	it.Reset(STAT_TELEPORT);
 	while (auto act = it.Next())
 	{
-		if (act->spr.picnum == RRTILE296)
+		if (act->spr.picnum == RRTELEPORT)
 		{
 			double xx;
 			int p = findplayer(act, &xx);
 			if (xx < 128)
 			{
-				DukeStatIterator it2(108);
+				DukeStatIterator it2(STAT_TELEPORT);
 				while (auto act2 = it2.Next())
 				{
-					if (act2->spr.picnum == RRTILE297)
+					if (act2->spr.picnum == RRTELEPORTDEST)
 					{
 						ps[p].angle.ang = act2->spr.angle;
 						ps[p].pos = act2->spr.pos.plusZ(-36);
diff --git a/source/games/duke/src/constants.h b/source/games/duke/src/constants.h
index d20de1589..9b9657098 100644
--- a/source/games/duke/src/constants.h
+++ b/source/games/duke/src/constants.h
@@ -276,6 +276,7 @@ enum
 	STAT_BOWLING		= 105,
 	STAT_CHICKENPLANT	= 106,
 	STAT_LUMBERMILL		= 107,
+	STAT_TELEPORT		= 108,
 	STAT_RABBITSPAWN	= 119,
 	STAT_REMOVED		= MAXSTATUS-2,
 	STAT_NETALLOC       = MAXSTATUS-1
diff --git a/source/games/duke/src/spawn_r.cpp b/source/games/duke/src/spawn_r.cpp
index 3e2aafb85..00d5dda1b 100644
--- a/source/games/duke/src/spawn_r.cpp
+++ b/source/games/duke/src/spawn_r.cpp
@@ -455,11 +455,11 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 		act->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
 		ChangeActorStat(act, STAT_LUMBERMILL);
 		break;
-	case RRTILE296:
-	case RRTILE297:
+	case RRTELEPORT:
+	case RRTELEPORTDEST:
 		act->spr.scale = DVector2(1, 1);
 		act->clipdist = 16;
-		ChangeActorStat(act, 108);
+		ChangeActorStat(act, STAT_TELEPORT);
 		break;
 	case CHICKENA:
 	case CHICKENB: