Move /set and /heal to libtrx

CHANGELOG.md

@@ -18,14 +18,18 @@
 - fixed `/tp` console command reporting teleport fails as success (#1484, regression from 4.1)
 - fixed `/tp` console command allowing teleporting to consumed savegame crystals (#1518)
 - fixed `/hp` console command taking arbitrary integers
+- fixed `/set` console command crashing with unknown targets (regression from 4.2)
 - fixed `/set` console command not sanitizing numeric values (#1515)
 - fixed console commands causing improper ring shutdown with selected inventory item (#1460, regression from 3.0)
 - fixed console input immediately ending demo (#1480, regression from 4.1)
 - fixed a potential softlock when killing the Torso boss in Great Pyramid (#1236)
 - fixed Bacon Lara re-spawning after saving and loading (#1500, regression from 0.7)
 - fixed config JSON not sanitizing some numeric values (#1515)
 - fixed potential crashes in custom levels if hybrid creature objects are not present in the level (#1444)
+- changed `/heal` console command to also extinguish Lara
 - changed `/tp` console command to look for the closest place to teleport to when targeting items (#1484)
+- changed `/set` console command output to always use fully-qualified option names
+- changed `/fps`, `/vsync`, `/wireframe`, `/braid` and `/cheats` console commands output to be in line with `/set` console command output
 - changed the door cheat to also target drawbridges
 - improved appearance of textures around edges when bilinear filter is off (#1483)
   Since this removes the seams on pushblocks, this was made optional.

data/ship/cfg/TR1X_gameflow.json5

@@ -692,15 +692,12 @@
         "MISC_EMPTY_SLOT_FMT": "- EMPTY SLOT %d -",
         "MISC_OFF": "Off",
         "MISC_ON": "On",
-        "OSD_BRAID_OFF": "Braid disabled",
-        "OSD_BRAID_ON": "Braid enabled",
-        "OSD_CHEATS_OFF": "Cheats disabled",
-        "OSD_CHEATS_ON": "Cheats enabled",
         "OSD_COMMAND_BAD_INVOCATION": "Invalid invocation: %s",
         "OSD_COMMAND_UNAVAILABLE": "This command is not currently available",
         "OSD_COMPLETE_LEVEL": "Level complete!",
         "OSD_CONFIG_OPTION_GET": "%s is currently set to %s",
         "OSD_CONFIG_OPTION_SET": "%s changed to %s",
+        "OSD_CONFIG_OPTION_UNKNOWN_OPTION": "Unknown option: %s",
         "OSD_CURRENT_HEALTH_GET": "Current Lara's health: %d",
         "OSD_CURRENT_HEALTH_SET": "Lara's health set to %d",
         "OSD_DOOR_CLOSE": "Close Sesame!",
@@ -751,10 +748,6 @@
         "OSD_TEXTURE_FILTER_NN": "nearest-neighbor",
         "OSD_TEXTURE_FILTER_SET": "Texture filter set to %s",
         "OSD_UNKNOWN_COMMAND": "Unknown command: %s",
-        "OSD_VSYNC_OFF": "VSync disabled",
-        "OSD_VSYNC_ON": "VSync enabled",
-        "OSD_WIREFRAME_OFF": "Wireframe disabled",
-        "OSD_WIREFRAME_ON": "Wireframe enabled",
         "PASSPORT_EXIT_GAME": "Exit Game",
         "PASSPORT_EXIT_TO_TITLE": "Exit to Title",
         "PASSPORT_LEGACY_SELECT_LEVEL_1": "Legacy saves do not",

data/ship/cfg/TR1X_gameflow_demo_pc.json5

@@ -187,15 +187,12 @@
         "MISC_EMPTY_SLOT_FMT": "- EMPTY SLOT %d -",
         "MISC_OFF": "Off",
         "MISC_ON": "On",
-        "OSD_BRAID_OFF": "Braid disabled",
-        "OSD_BRAID_ON": "Braid enabled",
-        "OSD_CHEATS_OFF": "Cheats disabled",
-        "OSD_CHEATS_ON": "Cheats enabled",
         "OSD_COMMAND_BAD_INVOCATION": "Invalid invocation: %s",
         "OSD_COMMAND_UNAVAILABLE": "This command is not currently available",
         "OSD_COMPLETE_LEVEL": "Level complete!",
         "OSD_CONFIG_OPTION_GET": "%s is currently set to %s",
         "OSD_CONFIG_OPTION_SET": "%s changed to %s",
+        "OSD_CONFIG_OPTION_UNKNOWN_OPTION": "Unknown option: %s",
         "OSD_CURRENT_HEALTH_GET": "Current Lara's health: %d",
         "OSD_CURRENT_HEALTH_SET": "Lara's health set to %d",
         "OSD_DOOR_CLOSE": "Close Sesame!",
@@ -246,10 +243,6 @@
         "OSD_TEXTURE_FILTER_NN": "nearest-neighbor",
         "OSD_TEXTURE_FILTER_SET": "Texture filter set to %s",
         "OSD_UNKNOWN_COMMAND": "Unknown command: %s",
-        "OSD_VSYNC_OFF": "VSync disabled",
-        "OSD_VSYNC_ON": "VSync enabled",
-        "OSD_WIREFRAME_OFF": "Wireframe disabled",
-        "OSD_WIREFRAME_ON": "Wireframe enabled",
         "PASSPORT_EXIT_GAME": "Exit Game",
         "PASSPORT_EXIT_TO_TITLE": "Exit to Title",
         "PASSPORT_LEGACY_SELECT_LEVEL_1": "Legacy saves do not",

data/ship/cfg/TR1X_gameflow_ub.json5

@@ -259,15 +259,12 @@
         "MISC_EMPTY_SLOT_FMT": "- EMPTY SLOT %d -",
         "MISC_OFF": "Off",
         "MISC_ON": "On",
-        "OSD_BRAID_OFF": "Braid disabled",
-        "OSD_BRAID_ON": "Braid enabled",
-        "OSD_CHEATS_OFF": "Cheats disabled",
-        "OSD_CHEATS_ON": "Cheats enabled",
         "OSD_COMMAND_BAD_INVOCATION": "Invalid invocation: %s",
         "OSD_COMMAND_UNAVAILABLE": "This command is not currently available",
         "OSD_COMPLETE_LEVEL": "Level complete!",
         "OSD_CONFIG_OPTION_GET": "%s is currently set to %s",
         "OSD_CONFIG_OPTION_SET": "%s changed to %s",
+        "OSD_CONFIG_OPTION_UNKNOWN_OPTION": "Unknown option: %s",
         "OSD_CURRENT_HEALTH_GET": "Current Lara's health: %d",
         "OSD_CURRENT_HEALTH_SET": "Lara's health set to %d",
         "OSD_DOOR_CLOSE": "Close Sesame!",
@@ -318,10 +315,6 @@
         "OSD_TEXTURE_FILTER_NN": "nearest-neighbor",
         "OSD_TEXTURE_FILTER_SET": "Texture filter set to %s",
         "OSD_UNKNOWN_COMMAND": "Unknown command: %s",
-        "OSD_VSYNC_OFF": "VSync disabled",
-        "OSD_VSYNC_ON": "VSync enabled",
-        "OSD_WIREFRAME_OFF": "Wireframe disabled",
-        "OSD_WIREFRAME_ON": "Wireframe enabled",
         "PASSPORT_EXIT_GAME": "Exit Game",
         "PASSPORT_EXIT_TO_TITLE": "Exit to Title",
         "PASSPORT_LEGACY_SELECT_LEVEL_1": "Legacy saves do not",

meson.build

@@ -151,6 +151,7 @@ sources = [
   'src/game/lara/lara_look.c',
   'src/game/lara/lara_misc.c',
   'src/game/lara/lara_state.c',
+  'src/game/lara/misc.c',
   'src/game/level.c',
   'src/game/los.c',
   'src/game/lot.c',

src/config.c

@@ -4,6 +4,7 @@
 #include "game/clock.h"
 #include "game/input.h"
 #include "game/music.h"
+#include "game/output.h"
 #include "game/requester.h"
 #include "game/sound.h"
 #include "global/const.h"
@@ -315,3 +316,13 @@ void Config_Sanitize(void)
         g_Config.rendering.fps = 30;
     }
 }
+
+void Config_ApplyChanges(void)
+{
+    Output_ApplyRenderSettings();
+}
+
+const CONFIG_OPTION *Config_GetOptionMap(void)
+{
+    return g_ConfigOptionMap;
+}

src/config.h

@@ -143,3 +143,4 @@ extern CONFIG g_Config;
 bool Config_Read(void);
 bool Config_Write(void);
 void Config_Sanitize(void);
+void Config_ApplyChanges(void);