diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-01 12:46:36 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-01 12:46:36 +0200 |
| commit | 79d66b79101d72a460ad2cc1338da06a292d30cc (patch) | |
| tree | 35332ede65efe94504a5fdb8b0a3a2cc25c885e2 /src/core | |
| parent | updated get/set (diff) | |
| parent | Merge pull request #499 from aap/master (diff) | |
| download | re3-79d66b79101d72a460ad2cc1338da06a292d30cc.tar re3-79d66b79101d72a460ad2cc1338da06a292d30cc.tar.gz re3-79d66b79101d72a460ad2cc1338da06a292d30cc.tar.bz2 re3-79d66b79101d72a460ad2cc1338da06a292d30cc.tar.lz re3-79d66b79101d72a460ad2cc1338da06a292d30cc.tar.xz re3-79d66b79101d72a460ad2cc1338da06a292d30cc.tar.zst re3-79d66b79101d72a460ad2cc1338da06a292d30cc.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Frontend.cpp | 25 | ||||
| -rw-r--r-- | src/core/Frontend.h | 10 | ||||
| -rw-r--r-- | src/core/config.h | 1 |
3 files changed, 36 insertions, 0 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 64332cb4..97cb21fd 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -3045,7 +3045,24 @@ CMenuManager::LoadSettings() if (strncmp(Ver, TopLineEmptyFile, sizeof(TopLineEmptyFile) - 1)) { CFileMgr::Seek(fileHandle, 0, 0); ControlsManager.LoadSettings(fileHandle); +#ifdef IMPROVED_VIDEOMODE + CFileMgr::Read(fileHandle, (char*)&m_nPrefsWidth, sizeof(m_nPrefsWidth)); + CFileMgr::Read(fileHandle, (char*)&m_nPrefsHeight, sizeof(m_nPrefsHeight)); + CFileMgr::Read(fileHandle, (char*)&m_nPrefsDepth, sizeof(m_nPrefsDepth)); + CFileMgr::Read(fileHandle, (char*)&m_nPrefsWindowed, sizeof(m_nPrefsWindowed)); + CFileMgr::Read(fileHandle, (char*)&m_nPrefsSubsystem, sizeof(m_nPrefsSubsystem)); + if(m_nPrefsWindowed != 0 && m_nPrefsWindowed != 1){ + // garbage data from vanilla settings file + // let skeleton find something + m_nPrefsWidth = 0; + m_nPrefsHeight = 0; + m_nPrefsDepth = 0; + m_nPrefsWindowed = 0; + m_nPrefsSubsystem = 0; + } +#else CFileMgr::Read(fileHandle, gString, 20); +#endif CFileMgr::Read(fileHandle, gString, 20); CFileMgr::Read(fileHandle, gString, 4); CFileMgr::Read(fileHandle, gString, 4); @@ -3127,7 +3144,15 @@ CMenuManager::SaveSettings() int fileHandle = CFileMgr::OpenFile("gta3.set", "w+"); if (fileHandle) { ControlsManager.SaveSettings(fileHandle); +#ifdef IMPROVED_VIDEOMODE + CFileMgr::Write(fileHandle, (char*)&m_nPrefsWidth, sizeof(m_nPrefsWidth)); + CFileMgr::Write(fileHandle, (char*)&m_nPrefsHeight, sizeof(m_nPrefsHeight)); + CFileMgr::Write(fileHandle, (char*)&m_nPrefsDepth, sizeof(m_nPrefsDepth)); + CFileMgr::Write(fileHandle, (char*)&m_nPrefsWindowed, sizeof(m_nPrefsWindowed)); + CFileMgr::Write(fileHandle, (char*)&m_nPrefsSubsystem, sizeof(m_nPrefsSubsystem)); +#else CFileMgr::Write(fileHandle, RubbishString, 20); +#endif CFileMgr::Write(fileHandle, RubbishString, 20); CFileMgr::Write(fileHandle, RubbishString, 4); CFileMgr::Write(fileHandle, RubbishString, 4); diff --git a/src/core/Frontend.h b/src/core/Frontend.h index c1284101..fc2c5235 100644 --- a/src/core/Frontend.h +++ b/src/core/Frontend.h @@ -533,6 +533,14 @@ public: int32 m_nCurrSaveSlot; int32 m_nScreenChangeDelayTimer; +#ifdef IMPROVED_VIDEOMODE + int32 m_nPrefsWidth; + int32 m_nPrefsHeight; + int32 m_nPrefsDepth; + int32 m_nPrefsWindowed; + int32 m_nPrefsSubsystem; +#endif + public: bool GetIsMenuActive() {return !!m_bMenuActive;} @@ -645,7 +653,9 @@ public: // uint8 GetNumberOfMenuOptions(); }; +#ifndef IMPROVED_VIDEOMODE static_assert(sizeof(CMenuManager) == 0x564, "CMenuManager: error"); +#endif extern CMenuManager FrontEndMenuManager; extern unsigned long _dwOperatingSystemVersion;
\ No newline at end of file diff --git a/src/core/config.h b/src/core/config.h index a1769c70..0d57f55d 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -192,6 +192,7 @@ enum Config { #define MORE_LANGUAGES // Add more translations to the game #define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch) #define USE_TXD_CDIMAGE // generate and load textures from txd.img +#define IMPROVED_VIDEOMODE // save and load videomode parameters instead of a magic number //#define USE_TEXTURE_POOL //#define OPENAL |