diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-08-02 17:23:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 17:23:06 +0200 |
| commit | ae1deb2209a5345d51b13c9534a2ef9877cbe09b (patch) | |
| tree | 93589ebfc2b9ef71b71afe9a45369d55127807eb /src/core/re3.cpp | |
| parent | Fix radio scroll when player controls disabled (diff) | |
| parent | Fix R* optimization that prevents peds to spawn (diff) | |
| download | re3-ae1deb2209a5345d51b13c9534a2ef9877cbe09b.tar re3-ae1deb2209a5345d51b13c9534a2ef9877cbe09b.tar.gz re3-ae1deb2209a5345d51b13c9534a2ef9877cbe09b.tar.bz2 re3-ae1deb2209a5345d51b13c9534a2ef9877cbe09b.tar.lz re3-ae1deb2209a5345d51b13c9534a2ef9877cbe09b.tar.xz re3-ae1deb2209a5345d51b13c9534a2ef9877cbe09b.tar.zst re3-ae1deb2209a5345d51b13c9534a2ef9877cbe09b.zip | |
Diffstat (limited to 'src/core/re3.cpp')
| -rw-r--r-- | src/core/re3.cpp | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 37c0a7ae..b80830c0 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -44,6 +44,9 @@ #include "Camera.h" #include "MBlur.h" #include "ControllerConfig.h" +#include "CarCtrl.h" +#include "Population.h" +#include "IniFile.h" #ifdef DETECT_JOYSTICK_MENU #include "crossplatform.h" @@ -560,22 +563,30 @@ bool LoadINISettings() // CFO check if (option.m_Action < MENUACTION_NOTHING && option.m_CFO->save) { - // CFO only supports saving uint8 right now - // Migrate from old .ini to new .ini - if (migrate && ReadIniIfExists("FrontendOptions", option.m_CFO->save, option.m_CFO->value)) + // Old values can only be int8, new ones can contain float if it is slider + if (migrate && ReadIniIfExists("FrontendOptions", option.m_CFO->save, (int8*)option.m_CFO->value)) cfg["FrontendOptions"].remove(option.m_CFO->save); + else if (option.m_Action == MENUACTION_CFO_SLIDER) + ReadIniIfExists(option.m_CFO->saveCat, option.m_CFO->save, (float*)option.m_CFO->value); else - ReadIniIfExists(option.m_CFO->saveCat, option.m_CFO->save, option.m_CFO->value); + ReadIniIfExists(option.m_CFO->saveCat, option.m_CFO->save, (int8*)option.m_CFO->value); if (option.m_Action == MENUACTION_CFO_SELECT) { - option.m_CFOSelect->lastSavedValue = option.m_CFOSelect->displayedValue = *option.m_CFO->value; + option.m_CFOSelect->lastSavedValue = option.m_CFOSelect->displayedValue = *(int8*)option.m_CFO->value; } } } } #endif + // Fetched in above block, but needs evaluation +#ifdef PED_CAR_DENSITY_SLIDERS + CPopulation::MaxNumberOfPedsInUse = DEFAULT_MAX_NUMBER_OF_PEDS * CIniFile::PedNumberMultiplier; + CPopulation::MaxNumberOfPedsInUseInterior = DEFAULT_MAX_NUMBER_OF_PEDS_INTERIOR * CIniFile::PedNumberMultiplier; + CCarCtrl::MaxNumberOfCarsInUse = DEFAULT_MAX_NUMBER_OF_CARS * CIniFile::CarNumberMultiplier; +#endif + return true; } @@ -656,8 +667,10 @@ void SaveINISettings() break; if (option.m_Action < MENUACTION_NOTHING && option.m_CFO->save) { - // Beware: CFO only supports saving uint8 right now - StoreIni(option.m_CFO->saveCat, option.m_CFO->save, *option.m_CFO->value); + if (option.m_Action == MENUACTION_CFO_SLIDER) + StoreIni(option.m_CFO->saveCat, option.m_CFO->save, *(float*)option.m_CFO->value); + else + StoreIni(option.m_CFO->saveCat, option.m_CFO->save, *(int8*)option.m_CFO->value); } } } |