- two more functions reverted.

source/games/duke/src/actors.cpp

@@ -51,6 +51,60 @@ Note:
 
 BEGIN_DUKE_NS
 
+//---------------------------------------------------------------------------
+//
+// 
+//
+//---------------------------------------------------------------------------
+
+bool ceilingspace(int sectnum)
+{
+	if ((sector[sectnum].ceilingstat & 1) && sector[sectnum].ceilingpal == 0)
+	{
+		switch (sector[sectnum].ceilingpicnum)
+		{
+		case MOONSKY1:
+		case BIGORBIT1:
+			return !(g_gameType & GAMEFLAG_RRALL);
+
+		case RR_MOONSKY1:
+		case RR_BIGORBIT1:
+			return !!(g_gameType & GAMEFLAG_RRALL);
+		}
+	}
+	return 0;
+}
+
+//---------------------------------------------------------------------------
+//
+// 
+//
+//---------------------------------------------------------------------------
+
+bool floorspace(int sectnum)
+{
+	if ((sector[sectnum].floorstat & 1) && sector[sectnum].ceilingpal == 0)
+	{
+		switch (sector[sectnum].floorpicnum)
+		{
+		case MOONSKY1:
+		case BIGORBIT1:
+			return !(g_gameType & GAMEFLAG_RRALL);
+
+		case RR_MOONSKY1:
+		case RR_BIGORBIT1:
+			return !!(g_gameType & GAMEFLAG_RRALL);
+		}
+	}
+	return 0;
+}
+
+//---------------------------------------------------------------------------
+//
+// 
+//
+//---------------------------------------------------------------------------
+
 bool ifsquished(int i, int p) 
 {
 	if (g_gameType & GAMEFLAG_RRALL) return false;	// this function is a no-op in RR's source.

source/games/duke/src/actors.h

@@ -320,17 +320,17 @@ ACTOR_INLINE int A_SetSprite(int const spriteNum, uint32_t cliptype)
 
 # endif
 
+bool ceilingspace(int sectnum);
+bool floorspace(int sectnum);
 
 EXTERN_INLINE int G_CheckForSpaceCeiling(int const sectnum)
 {
-    return ((sector[sectnum].ceilingstat&1) && sector[sectnum].ceilingpal == 0 &&
+    return ceilingspace(sectnum);
-            (sector[sectnum].ceilingpicnum==TILE_MOONSKY1 || sector[sectnum].ceilingpicnum==TILE_BIGORBIT1));
 }
 
 EXTERN_INLINE int G_CheckForSpaceFloor(int const sectnum)
 {
-    return ((sector[sectnum].floorstat&1) && sector[sectnum].ceilingpal == 0 &&
+    return floorspace(sectnum);
-            (sector[sectnum].floorpicnum==TILE_MOONSKY1 || sector[sectnum].floorpicnum==TILE_BIGORBIT1));
 }
 
 EXTERN_INLINE int A_CheckEnemySprite(void const * const pSprite)

source/games/duke/src/names.h

@@ -860,6 +860,16 @@ enum
 	RR_BIGAPPOS = 714,
 	RR_MINIFONT = 718,
 	RR_RESPAWNMARKERRED = 866,
+
+	RR_MOONSKY1 = 1022,
+	RR_MOONSKY2 = 1023,
+	RR_MOONSKY3 = 1024,
+	RR_MOONSKY4 = 1025,
+	RR_BIGORBIT1 = 1026,
+	RR_BIGORBIT2 = 1027,
+	RR_BIGORBIT3 = 1028,
+	RR_BIGORBIT4 = 1029,
+	RR_BIGORBIT5 =1030,
 	RR_WATERTILE2 = 1045,
 	RR_GLASS = 1056,
 	RR_GLASS2 = 1057,