tr2/fmv: add ability to turn fmvs off

Resolves #2110.

docs/tr2/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## [Unreleased](https://github.com/LostArtefacts/TRX/compare/tr2-0.7.1...develop) - ××××-××-××
 - completed decompilation efforts – TR2X.dll is gone, Tomb2.exe no longer needed (#1694)
+- added the ability to turn FMVs off (#2110)
 - added an option to use PS1 contrast levels, available under F8 (#1646)
 - added an option to allow disabling the developer console (#2063)
 - fixed Lara prioritising throwing a spent flare while mid-air, so to avoid missing ledge grabs (#1989)

docs/tr2/README.md

@@ -107,6 +107,7 @@ game with new enhancements and features.
 
 #### Mods
 - added developer console (accessible with `/`, see [COMMANDS.md](COMMANDS.md) for details)
+- added ability to disable FMVs
 
 #### Miscellaneous
 - added .jpeg/.png screenshots

src/tr2/config.h

@@ -22,6 +22,12 @@ typedef struct {
         bool fix_item_rots;
     } visuals;
 
+    struct {
+        int32_t sound_volume;
+        int32_t music_volume;
+        bool enable_lara_mic;
+    } audio;
+
     struct {
         bool fix_m16_accuracy;
         bool fix_item_duplication_glitch;
@@ -29,16 +35,11 @@ typedef struct {
         bool fix_flare_throw_priority;
         bool enable_cheats;
         bool enable_console;
+        bool enable_fmv;
         bool enable_auto_item_selection;
         int32_t turbo_speed;
     } gameplay;
 
-    struct {
-        int32_t sound_volume;
-        int32_t music_volume;
-        bool enable_lara_mic;
-    } audio;
-
     struct {
         bool is_fullscreen;
         bool is_maximized;

src/tr2/config_map.def

@@ -4,6 +4,7 @@ CFG_BOOL(g_Config, gameplay.fix_floor_data_issues, true)
 CFG_BOOL(g_Config, gameplay.fix_flare_throw_priority, true)
 CFG_BOOL(g_Config, gameplay.enable_cheats, false)
 CFG_BOOL(g_Config, gameplay.enable_console, true)
+CFG_BOOL(g_Config, gameplay.enable_fmv, true)
 CFG_BOOL(g_Config, gameplay.enable_auto_item_selection, true)
 CFG_INT32(g_Config, gameplay.turbo_speed, 0)
 CFG_BOOL(g_Config, visuals.enable_3d_pickups, true)

src/tr2/game/fmv.c

@@ -27,8 +27,6 @@ static void *M_LockSurface(void *surface, void *user_data);
 static void M_UnlockSurface(void *surface, void *user_data);
 static void M_UploadSurface(void *surface, void *user_data);
 
-static void M_EnterFMVMode(void);
-static void M_ExitFMVMode(void);
 static void M_Play(const char *file_name);
 
 static void *M_AllocateSurface(
@@ -87,18 +85,6 @@ static void M_UploadSurface(void *const surface, void *const user_data)
     GFX_2D_Renderer_Render(renderer_2d);
 }
 
-static void M_EnterFMVMode(void)
-{
-    Music_Stop();
-}
-
-static void M_ExitFMVMode(void)
-{
-    if (!g_IsGameToExit) {
-        Render_Reset(RENDER_RESET_ALL);
-    }
-}
-
 static void M_Play(const char *const file_name)
 {
     VIDEO *const video = Video_Open(file_name);
@@ -165,9 +151,16 @@ static void M_Play(const char *const file_name)
 
 void FMV_Play(const char *const file_name)
 {
-    M_EnterFMVMode();
+    Music_Stop();
+    if (!g_Config.gameplay.enable_fmv) {
+        return;
+    }
+
     M_Play(file_name);
-    M_ExitFMVMode();
+
+    if (!g_IsGameToExit) {
+        Render_Reset(RENDER_RESET_ALL);
+    }
 }
 
 bool FMV_IsPlaying(void)

tools/tr2/config/TR2X_ConfigTool/Resources/Lang/en.json

@@ -30,6 +30,10 @@
       "Title": "Console",
       "Description": "Enables the developer console."
     },
+    "enable_fmv": {
+      "Title": "Enable FMVs",
+      "Description": "Enables FMVs playing."
+    },
     "fix_m16_accuracy": {
       "Title": "Fix M16 accuracy",
       "Description": "Fixes the accuracy of the M16 while Lara is running."

tools/tr2/config/TR2X_ConfigTool/Resources/specification.json

@@ -73,6 +73,11 @@
           "Field": "enable_auto_item_selection",
           "DataType": "Bool",
           "DefaultValue": true
+        },
+        {
+          "Field": "enable_fmv",
+          "DataType": "Bool",
+          "DefaultValue": true
         }
       ]
     },