cmd/pos: use proper prefix for demos and cutscenes

data/tr1/ship/cfg/TR1X_strings.json5

@@ -468,7 +468,10 @@
         "OSD_PLAY_DEMO": "Loading demo %d",
         "OSD_PLAY_LEVEL": "Loading %s",
         "OSD_PLAY_MUSIC_TRACK": "Playing music track %d",
-        "OSD_POS_GET": "Level: %d (%s)  Room: %d\nPosition: %.3f, %.3f, %.3f\nRotation: %.3f,%.3f,%.3f",
+        "OSD_POS_CUTSCENE": "Cutscene",
+        "OSD_POS_DEMO": "Demo",
+        "OSD_POS_GET": "%s %d (%s)  Room: %d\nPosition: %.3f, %.3f, %.3f\nRotation: %.3f,%.3f,%.3f",
+        "OSD_POS_LEVEL": "Level",
         "OSD_POS_SET_ITEM": "Teleported to object: %s",
         "OSD_POS_SET_ITEM_FAIL": "Failed to teleport to object: %s",
         "OSD_POS_SET_POS": "Teleported to position: %.3f %.3f %.3f",

data/tr2/ship/cfg/TR2X_strings.json5

@@ -565,7 +565,10 @@
         "OSD_PLAY_DEMO": "Loading demo %d",
         "OSD_PLAY_LEVEL": "Loading %s",
         "OSD_PLAY_MUSIC_TRACK": "Playing music track %d",
-        "OSD_POS_GET": "Level: %d (%s)  Room: %d\nPosition: %.3f, %.3f, %.3f\nRotation: %.3f,%.3f,%.3f",
+        "OSD_POS_CUTSCENE": "Cutscene",
+        "OSD_POS_DEMO": "Demo",
+        "OSD_POS_GET": "%s %d (%s)  Room: %d\nPosition: %.3f, %.3f, %.3f\nRotation: %.3f,%.3f,%.3f",
+        "OSD_POS_LEVEL": "Level",
         "OSD_POS_SET_ITEM": "Teleported to object: %s",
         "OSD_POS_SET_ITEM_FAIL": "Failed to teleport to object: %s",
         "OSD_POS_SET_POS": "Teleported to position: %.3f %.3f %.3f",

docs/tr1/CHANGELOG.md

@@ -5,6 +5,7 @@
 - added drawing of object mesh spheres to the `/debug` console command
 - changed the Controls screen to hide the reset and unbind texts when changing a key (#2103)
 - changed injections to a new file format with a smaller footprint and improved applicability tests (#1967)
+- changed the `/pos` command to show `Demo` and `Cutscene` instead of `Level` when relevant
 - fixed several instances of the camera going out of bounds (#1034)
 - fixed issues with stacked, floating and flipmap pushblocks in custom levels
 - fixed issues with fixed cameras in 60 FPS shifting before settling on their target (#1186)

docs/tr2/CHANGELOG.md

@@ -7,6 +7,7 @@
 - added support for `-l`/`--level` argument to play a single level
 - added Italian localization to the config tool
 - changed injections to a new file format with a smaller footprint, improved applicability tests and similar feature support as TR1 (#1967)
+- changed the `/pos` command to show `Demo` and `Cutscene` instead of `Level` when relevant
 - fixed smashed windows blocking enemy pathing after loading a save (#2535)
 - fixed several instances of the camera going out of bounds (#1034)
 - fixed Lara getting stuck in a T-pose after jumping/falling and then dying before reaching fast fall speed (#2575)

src/libtrx/game/console/cmd/pos.c

@@ -23,9 +23,23 @@ static COMMAND_RESULT M_Entrypoint(const COMMAND_CONTEXT *const ctx)
 
     const ITEM *const lara_item = Lara_GetItem();
 
+    const char *prefix = nullptr;
+    switch (GF_GetCurrentLevel()->type) {
+    case GFL_CUTSCENE:
+        prefix = GS(OSD_POS_CUTSCENE);
+        break;
+    case GFL_DEMO:
+        prefix = GS(OSD_POS_DEMO);
+        break;
+    default:
+        prefix = GS(OSD_POS_LEVEL);
+        break;
+    }
+
     // clang-format off
     Console_Log(
         GS(OSD_POS_GET),
+        prefix,
         GF_GetCurrentLevel()->num,
         GF_GetCurrentLevel()->title,
         lara_item->room_num,

src/libtrx/include/libtrx/game/game_string.def

@@ -2,7 +2,10 @@ GS_DEFINE(HEADING_INVENTORY, "INVENTORY")
 GS_DEFINE(HEADING_GAME_OVER, "GAME OVER")
 GS_DEFINE(HEADING_OPTION, "OPTION")
 GS_DEFINE(HEADING_ITEMS, "ITEMS")
-GS_DEFINE(OSD_POS_GET, "Level: %d (%s)  Room: %d\nPosition: %.3f, %.3f, %.3f\nRotation: %.3f,%.3f,%.3f")
+GS_DEFINE(OSD_POS_GET, "%s %d (%s)  Room: %d\nPosition: %.3f, %.3f, %.3f\nRotation: %.3f,%.3f,%.3f")
+GS_DEFINE(OSD_POS_LEVEL, "Level")
+GS_DEFINE(OSD_POS_DEMO, "Demo")
+GS_DEFINE(OSD_POS_CUTSCENE, "Cutscene")
 GS_DEFINE(OSD_CURRENT_HEALTH_GET, "Current Lara's health: %d")
 GS_DEFINE(OSD_CURRENT_HEALTH_SET, "Lara's health set to %d")
 GS_DEFINE(OSD_CONFIG_OPTION_GET, "%s is currently set to %s")