tr2: add ability to skip cutscenes

Resolves #2127.

docs/tr2/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## [Unreleased](https://github.com/LostArtefacts/TRX/compare/tr2-0.10...develop) - ××××-××-××
 - added support for The Golden Mask (#1621)
 - added ability to turn off legal screen and FMVs (#2740)
+- added ability to turn off ingame cutscenes (#2127)
 - added sunglasses for graphic options (#1615)
 - added control over the fog distances for players and level builders (#1622)
 - added control over the water color for players and level builders (#1619)

src/libtrx/config/map_tr2.def

@@ -12,6 +12,7 @@ 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_legal, true)
+CFG_BOOL(g_Config, gameplay.enable_cutscenes, true)
 CFG_BOOL(g_Config, input.enable_tr3_sidesteps, true)
 CFG_BOOL(g_Config, input.enable_responsive_passport, true)
 CFG_BOOL(g_Config, gameplay.enable_auto_item_selection, true)

src/libtrx/game/game_flow/sequencer_events.c

@@ -37,12 +37,7 @@ static DECLARE_GF_EVENT_HANDLER(M_HandlePlayCutscene)
 {
     GF_COMMAND gf_cmd = { .action = GF_NOOP };
     const int16_t cutscene_num = (int16_t)(intptr_t)event->data;
-#if TR_VERSION == 1
-    if (!g_Config.gameplay.enable_cutscenes) {
-        return gf_cmd;
-    }
-#endif
-    if (seq_ctx != GFSC_SAVED) {
+    if (seq_ctx != GFSC_SAVED && g_Config.gameplay.enable_cutscenes) {
         gf_cmd = GF_DoCutsceneSequence(cutscene_num);
         if (gf_cmd.action == GF_LEVEL_COMPLETE) {
             gf_cmd.action = GF_NOOP;

src/libtrx/include/libtrx/config/types_tr2.h

@@ -85,6 +85,7 @@ typedef struct {
         bool enable_console;
         bool enable_fmv;
         bool enable_legal;
+        bool enable_cutscenes;
         bool enable_auto_item_selection;
         int32_t turbo_speed;
         bool enable_game_modes;