Display the floor and ceiling material name rather than the materialn…

…um in the "where" debug cheat info.
skyjake · Nov 30, 2008 · c93d268 · c93d268
1 parent f742e40
commit c93d268
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/doomsday/plugins/jdoom/src/m_cheat.c b/doomsday/plugins/jdoom/src/m_cheat.c
@@ -523,10 +523,10 @@ static void CheatDebugFunc(player_t *player, cheat_t *cheat)
     Con_Message(textBuffer);
     sub = player->plr->mo->subsector;
     Con_Message("\nSubsector %i:\n", P_ToIndex(sub));
-    Con_Message("  Floorz:%g pic:%d\n", P_GetFloatp(sub, DMU_FLOOR_HEIGHT),
-                P_GetIntp(sub, DMU_FLOOR_MATERIAL));
-    Con_Message("  Ceilingz:%g pic:%d\n", P_GetFloatp(sub, DMU_CEILING_HEIGHT),
-                P_GetIntp(sub, DMU_CEILING_MATERIAL));
+    Con_Message("  FloorZ:%g Material:%s\n", P_GetFloatp(sub, DMU_FLOOR_HEIGHT),
+                R_MaterialNameForNum(P_GetIntp(sub, DMU_FLOOR_MATERIAL)));
+    Con_Message("  CeilingZ:%g Material:%s\n", P_GetFloatp(sub, DMU_CEILING_HEIGHT),
+                R_MaterialNameForNum(P_GetIntp(sub, DMU_CEILING_MATERIAL)));
     Con_Message("Player height:%g   Player radius:%g\n",
                 player->plr->mo->height, player->plr->mo->radius);
 }

diff --git a/doomsday/plugins/jdoom64/src/m_cheat.c b/doomsday/plugins/jdoom64/src/m_cheat.c
@@ -555,10 +555,10 @@ static void CheatDebugFunc(player_t *player, cheatseq_t *cheat)
     Con_Message(textBuffer);
     sub = player->plr->mo->subsector;
     Con_Message("\nSubsector %i:\n", P_ToIndex(sub));
-    Con_Message("  Floorz:%g pic:%d\n", P_GetFloatp(sub, DMU_FLOOR_HEIGHT),
-                P_GetIntp(sub, DMU_FLOOR_MATERIAL));
-    Con_Message("  Ceilingz:%g pic:%d\n", P_GetFloatp(sub, DMU_CEILING_HEIGHT),
-                P_GetIntp(sub, DMU_CEILING_MATERIAL));
+    Con_Message("  FloorZ:%g Material:%s\n", P_GetFloatp(sub, DMU_FLOOR_HEIGHT),
+                R_MaterialNameForNum(P_GetIntp(sub, DMU_FLOOR_MATERIAL)));
+    Con_Message("  CeilingZ:%g Material:%s\n", P_GetFloatp(sub, DMU_CEILING_HEIGHT),
+                R_MaterialNameForNum(P_GetIntp(sub, DMU_CEILING_MATERIAL)));
     Con_Message("Player height:%g   Player radius:%g\n",
                 player->plr->mo->height, player->plr->mo->radius);
 }

diff --git a/doomsday/plugins/jheretic/src/m_cheat.c b/doomsday/plugins/jheretic/src/m_cheat.c
@@ -707,12 +707,10 @@ static void CheatDebugFunc(player_t *player, cheatseq_t *cheat)
     Con_Message(textBuffer);
     sub = player->plr->mo->subsector;
     Con_Message("\nSubsector %i:\n", P_ToIndex(sub));
-    Con_Message("  Floorz:%g material:%d\n",
-                P_GetFloatp(sub, DMU_FLOOR_HEIGHT),
-                P_GetIntp(sub, DMU_FLOOR_MATERIAL));
-    Con_Message("  Ceilingz:%g material:%d\n",
-                P_GetFloatp(sub, DMU_CEILING_HEIGHT),
-                P_GetIntp(sub, DMU_CEILING_MATERIAL));
+    Con_Message("  FloorZ:%g Material:%s\n", P_GetFloatp(sub, DMU_FLOOR_HEIGHT),
+                R_MaterialNameForNum(P_GetIntp(sub, DMU_FLOOR_MATERIAL)));
+    Con_Message("  CeilingZ:%g Material:%s\n", P_GetFloatp(sub, DMU_CEILING_HEIGHT),
+                R_MaterialNameForNum(P_GetIntp(sub, DMU_CEILING_MATERIAL)));
     Con_Message("Player height:%g   Player radius:%g\n",
                 player->plr->mo->height, player->plr->mo->radius);
 }

diff --git a/doomsday/plugins/jhexen/src/m_cheat.c b/doomsday/plugins/jhexen/src/m_cheat.c
@@ -879,10 +879,10 @@ static void CheatDebugFunc(player_t *player, cheat_t *cheat)
     Con_Message(textBuffer);
     sub = player->plr->mo->subsector;
     Con_Message("\nSubsector %i:\n", P_ToIndex(sub));
-    Con_Message("  Floorz:%g pic:%d\n", P_GetFloatp(sub, DMU_FLOOR_HEIGHT),
-                P_GetIntp(sub, DMU_FLOOR_MATERIAL));
-    Con_Message("  Ceilingz:%g pic:%d\n", P_GetFloatp(sub, DMU_CEILING_HEIGHT),
-                P_GetIntp(sub, DMU_CEILING_MATERIAL));
+    Con_Message("  FloorZ:%g Material:%s\n", P_GetFloatp(sub, DMU_FLOOR_HEIGHT),
+                R_MaterialNameForNum(P_GetIntp(sub, DMU_FLOOR_MATERIAL)));
+    Con_Message("  CeilingZ:%g Material:%s\n", P_GetFloatp(sub, DMU_CEILING_HEIGHT),
+                R_MaterialNameForNum(P_GetIntp(sub, DMU_CEILING_MATERIAL)));
     Con_Message("Player height:%g   Player radius:%g\n",
                 player->plr->mo->height, player->plr->mo->radius);
 }