mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-26 14:55:40 +00:00
Code Issues Projects Releases Wiki Activity

Fixed settings loading, added TopLineEmptyFile

Browse source
This commit is contained in:
Sergeanur 2019-10-30 01:14:59 +02:00
parent d84033a710
commit 74ca8bb608
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/ControllerConfig.cpp
View file

@ -16,6 +16,7 @@
#include "ModelIndices.h" #include "ModelIndices.h"
#include "Camera.h" #include "Camera.h"
#include "win.h" #include "win.h"
#include "PCSave.h"
CControllerConfigManager &ControlsManager = *(CControllerConfigManager*)0x8F43A4; CControllerConfigManager &ControlsManager = *(CControllerConfigManager*)0x8F43A4;
@ -75,7 +76,7 @@ void CControllerConfigManager::LoadSettings(int32 file)
char buff[29]; char buff[29];
CFileMgr::Read(file, buff, sizeof(buff)); CFileMgr::Read(file, buff, sizeof(buff));
if (!strcmp(buff, "THIS FILE IS NOT VALID YET")) if (!strncmp(buff, TopLineEmptyFile, sizeof(TopLineEmptyFile)-1))
bValid = false; bValid = false;
else else
CFileMgr::Seek(file, 0, 0); CFileMgr::Seek(file, 0, 0);

6
src/core/Frontend.cpp
View file

@ -1148,12 +1148,12 @@ void CMenuManager::LoadSettings()
CMBlur::BlurOn = true; CMBlur::BlurOn = true;
MousePointerStateHelper.bInvertVertically = true; MousePointerStateHelper.bInvertVertically = true;
static char Ver; char Ver[50];
int fileHandle = CFileMgr::OpenFile("gta3.set", "r"); int fileHandle = CFileMgr::OpenFile("gta3.set", "r");
if (fileHandle) { if (fileHandle) {
CFileMgr::Read(fileHandle, (char*)&Ver, sizeof(Ver)); CFileMgr::Read(fileHandle, Ver, 29);
if (strncmp(&Ver, "THIS FILE IS NOT VALID YET", 26)) { if (strncmp(Ver, TopLineEmptyFile, sizeof(TopLineEmptyFile) - 1)) {
CFileMgr::Seek(fileHandle, 0, 0); CFileMgr::Seek(fileHandle, 0, 0);
ControlsManager.LoadSettings(fileHandle); ControlsManager.LoadSettings(fileHandle);
CFileMgr::Read(fileHandle, gString, 20); CFileMgr::Read(fileHandle, gString, 20);

2
src/core/PCSave.h
View file

@ -19,3 +19,5 @@ extern C_PcSave PcSaveHelper;
extern int *Slots; extern int *Slots;
extern int *SlotFileName; extern int *SlotFileName;
extern int *SlotSaveDate; extern int *SlotSaveDate;
const char TopLineEmptyFile[] = "THIS FILE IS NOT VALID YET";