From 40d63ed8afedaaf380b628fa9ea77e5c470bf377 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Tue, 15 Aug 2017 17:53:09 +0200 Subject: [PATCH] Disable the recorder feature by default In order to be really fun, I must add a new window where it will be possible to load a record exactly like for the savegame. A button should be added to the main screen in order to access to the records. I suggets to add this feature with the next version. --- src/blupi.cxx | 18 +++++++++++++----- src/blupi.h | 1 + src/event.cxx | 8 ++++++-- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/blupi.cxx b/src/blupi.cxx index fac2b84..9b1a991 100644 --- a/src/blupi.cxx +++ b/src/blupi.cxx @@ -57,11 +57,12 @@ CMovie * g_pMovie = nullptr; // movie principal CDecor * g_pDecor = nullptr; std::thread * g_updateThread = nullptr; -bool g_bFullScreen = false; // false si mode de test -Sint32 g_speedRate = 1; -Sint32 g_timerInterval = 50; // inverval = 50ms -int g_rendererType = 0; -bool g_restoreBugs = false; // restore original < v1.9 bugs +bool g_bFullScreen = false; // false si mode de test +Sint32 g_speedRate = 1; +Sint32 g_timerInterval = 50; // inverval = 50ms +int g_rendererType = 0; +bool g_enableRecorder = false; +bool g_restoreBugs = false; // restore original < v1.9 bugs enum Settings { SETTING_FULLSCREEN = 1 << 0, @@ -521,6 +522,10 @@ parseArgs (int argc, char * argv[], bool & exit) {"-r", "--renderer"}, "set a renderer [auto;software;accelerated] (default: auto)", 1}, + {"enablerecorder", + {"-c", "--enable-recorder"}, + "enable the recorder feature (F3/F4)", + 0}, {"restorebugs", {"-b", "--restore-bugs"}, "restore funny original bugs of older versions < v1.9", @@ -581,6 +586,9 @@ parseArgs (int argc, char * argv[], bool & exit) g_settingsOverload |= SETTING_RENDERER; } + if (args["enablerecorder"]) + g_enableRecorder = true; + if (args["restorebugs"]) g_restoreBugs = true; diff --git a/src/blupi.h b/src/blupi.h index 0691a1a..170a361 100644 --- a/src/blupi.h +++ b/src/blupi.h @@ -29,6 +29,7 @@ extern SDL_Window * g_window; extern SDL_Renderer * g_renderer; extern bool g_bFullScreen; extern bool g_restoreBugs; +extern bool g_enableRecoder; struct POINT { Sint32 x; diff --git a/src/event.cxx b/src/event.cxx index a0221c1..ac65be6 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -5237,14 +5237,18 @@ CEvent::TreatEventBase (const SDL_Event & event) } return true; case SDLK_F3: - if (m_phase == EV_PHASE_PLAY && !m_bDemoPlay && !m_bStartRecording) + if ( + g_enableRecoder && m_phase == EV_PHASE_PLAY && !m_bDemoPlay && + !m_bStartRecording) { DemoRecStart (); // start recording m_bStartRecording = true; } break; case SDLK_F4: - if (m_phase == EV_PHASE_PLAY && !m_bDemoPlay && m_bStartRecording) + if ( + g_enableRecoder && m_phase == EV_PHASE_PLAY && !m_bDemoPlay && + m_bStartRecording) { DemoRecStop (); // stop recording m_bStartRecording = false;