- use classtypes in fallspecial.

ZDoom · Mar 27, 2023 · 7e6852b · 7e6852b
1 parent b6a6853
commit 7e6852b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp
@@ -1038,10 +1038,10 @@ static int fallspecial(DDukeActor *actor, int playernum)
 	{
 		if (actor->sector()->lotag == ST_801_ROCKY)
 		{
-			if (actor->spr.picnum == RTILE_ROCK)
+			if (actor->GetClass() == RedneckRockClass)
 			{
-				spawn(actor, RTILE_ROCK2);
-				spawn(actor, RTILE_ROCK2);
+				spawn(actor, RedneckRock2Class);
+				spawn(actor, RedneckRock2Class);
 				addspritetodelete();
 			}
 			return 0;
@@ -1058,7 +1058,7 @@ static int fallspecial(DDukeActor *actor, int playernum)
 		}
 		else if (actor->sector()->lotag == ST_803_KILLROCKS)
 		{
-			if (actor->spr.picnum == RTILE_ROCK2)
+			if (actor->GetClass() == RedneckRock2Class)
 				addspritetodelete();
 			return 0;
 		}

diff --git a/source/games/duke/src/classnames.h b/source/games/duke/src/classnames.h
@@ -114,3 +114,5 @@ xx(RedneckTitAmmo)
 xx(DukeRadiusExplosion)
 xx(DukePlayerBase)
 xx(DukePlayerPawn)
+xx(RedneckRock)
+xx(RedneckRock2)