make option more general

LostArtefacts · Aug 28, 2023 · b052ed6 · b052ed6
1 parent 3fcb766
commit b052ed6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/config.c b/src/config.c
@@ -234,7 +234,7 @@ bool Config_ReadFromJSON(const char *cfg_data)
     READ_BOOL(load_current_music, true);
     READ_BOOL(load_music_triggers, true);
     READ_BOOL(fix_item_rots, true);
-    READ_BOOL(restore_khamoon_mummy, false);
+    READ_BOOL(restore_ps1_enemies, false);
 
     CLAMP(g_Config.start_lara_hitpoints, 1, LARA_HITPOINTS);
     CLAMP(g_Config.fov_value, 30, 255);
@@ -422,7 +422,7 @@ bool Config_Write(void)
     WRITE_BOOL(load_current_music);
     WRITE_BOOL(load_music_triggers);
     WRITE_BOOL(fix_item_rots);
-    WRITE_BOOL(restore_khamoon_mummy);
+    WRITE_BOOL(restore_ps1_enemies);
 
     // User settings
     WRITE_BOOL(rendering.enable_bilinear_filter);

diff --git a/src/config.h b/src/config.h
@@ -114,7 +114,7 @@ typedef struct {
     bool load_current_music;
     bool load_music_triggers;
     bool fix_item_rots;
-    bool restore_khamoon_mummy;
+    bool restore_ps1_enemies;
 
     struct {
         int32_t layout;

diff --git a/src/game/inject.c b/src/game/inject.c
@@ -34,7 +34,7 @@ typedef enum INJECTION_TYPE {
     INJ_LARA_ANIMS = 5,
     INJ_LARA_JUMPS = 6,
     INJ_ITEM_ROTATION = 7,
-    INJ_KHAMOON_MUMMY = 8,
+    INJ_PS1_ENEMY = 8,
 } INJECTION_TYPE;
 
 typedef struct INJECTION {
@@ -218,8 +218,8 @@ static void Inject_LoadFromFile(INJECTION *injection, const char *filename)
     case INJ_ITEM_ROTATION:
         injection->relevant = g_Config.fix_item_rots;
         break;
-    case INJ_KHAMOON_MUMMY:
-        injection->relevant = g_Config.restore_khamoon_mummy;
+    case INJ_PS1_ENEMY:
+        injection->relevant = g_Config.restore_ps1_enemies;
         break;
     default:
         LOG_WARNING("%s is of unknown type %d", filename, injection->type);

diff --git a/tools/config/Tomb1Main_ConfigTool/Resources/Lang/en.json b/tools/config/Tomb1Main_ConfigTool/Resources/Lang/en.json
@@ -239,8 +239,8 @@
       "Title": "Change Pierre spawn behavior",
       "Description": "Makes a freshly triggered (runaway) Pierre replace an already existing (runaway) Pierre."
     },
-    "restore_khamoon_mummy": {
-      "Title": "Restore City of Khamoon mummy",
+    "restore_ps1_enemies": {
+      "Title": "Restore PS1 enemies",
       "Description": "Adds the mummy that appears in the PlayStation version of City of Khamoon, room 25.\nNB Changing this option will require restarting the level."
     },
     "enable_timer_in_inventory": {

diff --git a/tools/config/Tomb1Main_ConfigTool/Resources/Lang/fr.json b/tools/config/Tomb1Main_ConfigTool/Resources/Lang/fr.json
@@ -239,8 +239,8 @@
       "Title": "Modifier le comportement d'apparition de Pierre",
       "Description": "Fait en sorte que Pierre (en fuite) remplace bien un autre Pierre (en fuite) déjà existant."
     },
-    "restore_khamoon_mummy": {
-      "Title": "Restaure la momie dans la Cité de Khamoon",
+    "restore_ps1_enemies": {
+      "Title": "Restaure les ennemis PlayStation",
       "Description": "Remet la momie absente sur la version PC mais présente dans la version PlayStation (room 25).\nAttention, changer cette option sur une partie en cours nécessite de redémarrer le niveau, pour être prise en charge."
     },
     "enable_timer_in_inventory": {

diff --git a/tools/config/Tomb1Main_ConfigTool/Resources/specification.json b/tools/config/Tomb1Main_ConfigTool/Resources/specification.json
@@ -267,7 +267,7 @@
           "DefaultValue": true
         },
         {
-          "Field": "restore_khamoon_mummy",
+          "Field": "restore_ps1_enemies",
           "DataType": "Bool",
           "DefaultValue": false
         },