1 files changed, 16 insertions, 6 deletions
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index b21bff58..8c0020d0 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -2,7 +2,6 @@
 #define WITHWINDOWS
 #include "common.h"
 #include "crossplatform.h"
-#include "patcher.h"
 #include "Renderer.h"
 #include "Credits.h"
 #include "Camera.h"
@@ -75,7 +74,6 @@ mysrand(unsigned int seed)
 
 void ReloadFrontendOptions(void)
 {
-	RemoveCustomFrontendOptions();
 	CustomFrontendOptionsPopulate();
 }
 
@@ -133,10 +131,20 @@ void ToggleFreeCam(int8 action)
 }
 #endif
 
+#ifdef CUTSCENE_BORDERS_SWITCH
+void BorderModeChange(int8 displayedValue)
+{
+	CMenuManager::m_PrefsCutsceneBorders = !!displayedValue;
+	FrontEndMenuManager.SaveSettings();
+}
+#endif
+
 // Reloaded on language change, so you can use hardcoded wchar* and TheText.Get with peace of mind
 void
 CustomFrontendOptionsPopulate(void)
 {
+	RemoveCustomFrontendOptions(); // if exist
+
 #ifdef MORE_LANGUAGES
 	FrontendOptionSetPosition(MENUPAGE_LANGUAGE_SETTINGS);
 	FrontendOptionAddDynamic(TheText.Get("FEL_POL"), nil, LangPolSelect, nil);
@@ -160,6 +168,12 @@ CustomFrontendOptionsPopulate(void)
 	FrontendOptionSetPosition(MENUPAGE_CONTROLLER_PC, 1);
 	FrontendOptionAddDynamic(text, nil, ToggleFreeCam, nil);
 #endif
+
+#ifdef CUTSCENE_BORDERS_SWITCH
+	static const wchar *off_on[] = { TheText.Get("FEM_OFF"), TheText.Get("FEM_ON") };
+	FrontendOptionSetPosition(MENUPAGE_GRAPHICS_SETTINGS, 9);
+	FrontendOptionAddSelect((const wchar *)L"CUTSCENE BORDERS", off_on, 2, (int8 *)&CMenuManager::m_PrefsCutsceneBorders, false, BorderModeChange, nil);
+#endif
 }
 #endif
 
@@ -484,11 +498,7 @@ DebugMenuPopulate(void)
 #ifdef CUSTOM_FRONTEND_OPTIONS
 		DebugMenuAddCmd("Debug", "Reload custom frontend options", ReloadFrontendOptions);
 #endif
-#ifdef TOGGLEABLE_BETA_FEATURES
 		DebugMenuAddVarBool8("Debug", "Toggle popping heads on headshot", &CPed::bPopHeadsOnHeadshot, nil);
-		DebugMenuAddVarBool8("Debug", "Toggle peds running to phones to report crimes", &CPed::bMakePedsRunToPhonesToReportCrimes, nil);
-#endif
-
 		DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
 		DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);