Fixed "where" ccmd in jHeretic. Plus implemented it in jDoom.

doomsday/plugins/jdoom/src/d_console.c

@@ -39,6 +39,7 @@ DEFCC(CCmdCheatWarp);
 DEFCC(CCmdCheatReveal);
 DEFCC(CCmdCheatGive);
 DEFCC(CCmdCheatMassacre);
+DEFCC(CCmdCheatWhere);
 DEFCC(CCmdCheatExitLevel);
 DEFCC(CCmdCheatSuicide);
 
@@ -200,6 +201,7 @@ ccmd_t  gameCCmds[] = {
     {"kill",        CCmdCheatMassacre},
     {"exitlevel",   CCmdCheatExitLevel},
     {"suicide",     CCmdCheatSuicide},
+    {"where",       CCmdCheatWhere},
 
     {"doomfont",    CCmdDoomFont},
 

doomsday/plugins/jdoom/src/m_cheat.c

@@ -492,6 +492,35 @@ void cht_PosFunc(player_t *plyr)
     P_SetMessage(plyr, buf);
 }
 
+static void CheatDebugFunc(player_t *player, cheat_t * cheat)
+{
+    char    lumpName[9];
+    char    textBuffer[256];
+    subsector_t *sub;
+
+    if(!player->plr->mo || !usergame)
+        return;
+
+    P_GetMapLumpName(gameepisode, gamemap, lumpName);
+    sprintf(textBuffer, "MAP [%s]  X:%5d  Y:%5d  Z:%5d",
+            lumpName,
+            player->plr->mo->pos[VX] >> FRACBITS,
+            player->plr->mo->pos[VY] >> FRACBITS,
+            player->plr->mo->pos[VZ] >> FRACBITS);
+    P_SetMessage(player, textBuffer);
+
+    // Also print some information to the console.
+    Con_Message(textBuffer);
+    sub = player->plr->mo->subsector;
+    Con_Message("\nSubsector %i:\n", P_ToIndex(sub));
+    Con_Message("  Floorz:%d pic:%d\n", P_GetIntp(sub, DMU_FLOOR_HEIGHT),
+                P_GetIntp(sub, DMU_FLOOR_TEXTURE));
+    Con_Message("  Ceilingz:%d pic:%d\n", P_GetIntp(sub, DMU_CEILING_HEIGHT),
+                P_GetIntp(sub, DMU_CEILING_TEXTURE));
+    Con_Message("Player height:%x   Player radius:%x\n",
+                player->plr->mo->height, player->plr->mo->radius);
+}
+
 /*
  * This is the multipurpose cheat ccmd.
  */
@@ -759,6 +788,14 @@ DEFCC(CCmdCheatMassacre)
     return true;
 }
 
+DEFCC(CCmdCheatWhere)
+{
+    if(!can_cheat())
+        return false;           // Can't cheat!
+    CheatDebugFunc(players + consoleplayer, NULL);
+    return true;
+}
+
 /*
  * Exit the current level and goto the intermission.
  */

doomsday/plugins/jheretic/src/h_console.c

@@ -182,6 +182,7 @@ ccmd_t  gameCCmds[] = {
     {"kill",       CCmdCheatMassacre},
     {"exitlevel",  CCmdCheatExitLevel},
     {"suicide",    CCmdCheatSuicide},
+    {"where",      CCmdCheatWhere},
 
     {"hereticfont",CCmdHereticFont},
 
@@ -203,7 +204,6 @@ ccmd_t  gameCCmds[] = {
     {"invleft",    CCmdInventory},
     {"invright",   CCmdInventory},
     {"chicken",    CCmdCheatPig},
-    {"where",      CCmdCheatWhere},
     {NULL}
 };
 

doomsday/plugins/jheretic/src/m_cheat.c

@@ -692,6 +692,35 @@ static void CheatIDDQDFunc(player_t *player, Cheat_t * cheat)
     P_SetMessage(player, TXT_CHEATIDDQD);
 }
 
+static void CheatDebugFunc(player_t *player, cheat_t * cheat)
+{
+    char    lumpName[9];
+    char    textBuffer[256];
+    subsector_t *sub;
+
+    if(!player->plr->mo || !usergame)
+        return;
+
+    P_GetMapLumpName(gameepisode, gamemap, lumpName);
+    sprintf(textBuffer, "MAP [%s]  X:%5d  Y:%5d  Z:%5d",
+            lumpName,
+            player->plr->mo->pos[VX] >> FRACBITS,
+            player->plr->mo->pos[VY] >> FRACBITS,
+            player->plr->mo->pos[VZ] >> FRACBITS);
+    P_SetMessage(player, textBuffer);
+
+    // Also print some information to the console.
+    Con_Message(textBuffer);
+    sub = player->plr->mo->subsector;
+    Con_Message("\nSubsector %i:\n", P_ToIndex(sub));
+    Con_Message("  Floorz:%d pic:%d\n", P_GetIntp(sub, DMU_FLOOR_HEIGHT),
+                P_GetIntp(sub, DMU_FLOOR_TEXTURE));
+    Con_Message("  Ceilingz:%d pic:%d\n", P_GetIntp(sub, DMU_CEILING_HEIGHT),
+                P_GetIntp(sub, DMU_CEILING_TEXTURE));
+    Con_Message("Player height:%x   Player radius:%x\n",
+                player->plr->mo->height, player->plr->mo->radius);
+}
+
 // This is the multipurpose cheat ccmd.
 DEFCC(CCmdCheat)
 {
@@ -887,8 +916,9 @@ DEFCC(CCmdCheatMassacre)
 
 DEFCC(CCmdCheatWhere)
 {
-    /*  if(!canCheat()) return false; // Can't cheat!
-       CheatDebugFunc(players+consoleplayer, NULL); */
+    if(!canCheat())
+        return false;           // Can't cheat!
+    CheatDebugFunc(players+consoleplayer, NULL);
     return true;
 }
 

doomsday/plugins/jhexen/src/hconsole.c

@@ -174,6 +174,7 @@ ccmd_t  gameCCmds[] = {
     {"give",        CCmdCheatGive},
     {"kill",        CCmdCheatMassacre},
     {"suicide",     CCmdCheatSuicide},
+    {"where",       CCmdCheatWhere},
 
     {"hexenfont",   CCmdHexenFont},
 
@@ -197,7 +198,6 @@ ccmd_t  gameCCmds[] = {
     {"pig",         CCmdCheatPig},
     {"runscript",   CCmdCheatRunScript},
     {"scriptinfo",  CCmdScriptInfo},
-    {"where",       CCmdCheatWhere},
     {"class",       CCmdCheatShadowcaster},
 #ifdef DEMOCAM
     {"demomode",    CCmdSetDemoMode},

doomsday/plugins/jhexen/src/m_cheat.c

@@ -926,14 +926,16 @@ static void CheatVersionFunc(player_t *player, cheat_t * cheat)
 
 static void CheatDebugFunc(player_t *player, cheat_t * cheat)
 {
+    char    lumpName[9];
     char    textBuffer[256];
     subsector_t *sub;
 
-    if(!player->plr->mo)
+    if(!player->plr->mo || !usergame)
         return;
 
-    sprintf(textBuffer, "MAP %d (%d)  X:%5d  Y:%5d  Z:%5d",
-            P_GetMapWarpTrans(gamemap), gamemap,
+    P_GetMapLumpName(gameepisode, gamemap, lumpName);
+    sprintf(textBuffer, "MAP [%s]  X:%5d  Y:%5d  Z:%5d",
+            lumpName,
             player->plr->mo->pos[VX] >> FRACBITS,
             player->plr->mo->pos[VY] >> FRACBITS,
             player->plr->mo->pos[VZ] >> FRACBITS);
@@ -1258,7 +1260,8 @@ DEFCC(CCmdCheatShadowcaster)
 
 DEFCC(CCmdCheatWhere)
 {
-    //if(!canCheat()) return false; // Can't cheat!
+    if(!canCheat())
+        return false;           // Can't cheat!
     CheatDebugFunc(players + consoleplayer, NULL);
     return true;
 }