diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-07-04 22:50:43 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-07-04 22:50:43 +0200 |
| commit | ceb1defc4e220037ad1b17eb2b8a497c1385de7b (patch) | |
| tree | 12b180ce323a9166a50bb4d028a0bdc27f31b76c /src/core/re3.cpp | |
| parent | Merge pull request #648 from Nick007J/miami (diff) | |
| download | re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar.gz re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar.bz2 re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar.lz re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar.xz re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.tar.zst re3-ceb1defc4e220037ad1b17eb2b8a497c1385de7b.zip | |
Diffstat (limited to 'src/core/re3.cpp')
| -rw-r--r-- | src/core/re3.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/re3.cpp b/src/core/re3.cpp index d49eff50..7058c812 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -77,7 +77,6 @@ mysrand(unsigned int seed) void ReloadFrontendOptions(void) { - RemoveCustomFrontendOptions(); CustomFrontendOptionsPopulate(); } @@ -139,6 +138,8 @@ void ToggleFreeCam(int8 action) void CustomFrontendOptionsPopulate(void) { + RemoveCustomFrontendOptions(); // if exist + #ifdef MORE_LANGUAGES FrontendOptionSetPosition(MENUPAGE_LANGUAGE_SETTINGS); FrontendOptionAddDynamic(TheText.Get("FEL_POL"), nil, LangPolSelect, nil); @@ -152,11 +153,6 @@ CustomFrontendOptionsPopulate(void) FrontendOptionAddSelect(TheText.Get("SCRFOR"), screenModes, 2, (int8*)&FrontEndMenuManager.m_nPrefsWindowed, true, ScreenModeChange, nil); #endif -#ifdef MENU_MAP - FrontendOptionSetPosition(MENUPAGE_PAUSE_MENU, 2); - FrontendOptionAddRedirect(TheText.Get("FEG_MAP"), MENUPAGE_MAP); -#endif - #ifdef FREE_CAM static const wchar *text = (wchar*)L"TOGGLE FREE CAM"; FrontendOptionSetPosition(MENUPAGE_CONTROLLER_PC, 1); @@ -252,7 +248,7 @@ FixCar(void) } } -#ifdef MENU_MAP +#ifdef MAP_ENHANCEMENTS static void TeleportToWaypoint(void) { @@ -499,7 +495,7 @@ DebugMenuPopulate(void) DebugMenuAddVarBool8("Debug", "pad 1 -> pad 2", &CPad::m_bMapPadOneToPadTwo, nil); DebugMenuAddVarBool8("Debug", "Edit on", &CSceneEdit::m_bEditOn, nil); -#ifdef MENU_MAP +#ifdef MAP_ENHANCEMENTS DebugMenuAddCmd("Debug", "Teleport to map waypoint", TeleportToWaypoint); #endif DebugMenuAddCmd("Debug", "Switch car collision", SwitchCarCollision); |