From fa4dbcab35733bb0b760cdb24a7d74b285360eb0 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Tue, 14 Jan 2020 01:13:42 +0200 Subject: save --- src/save/GenericGameStorage.cpp | 348 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 348 insertions(+) create mode 100644 src/save/GenericGameStorage.cpp (limited to 'src/save/GenericGameStorage.cpp') diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp new file mode 100644 index 00000000..302b050d --- /dev/null +++ b/src/save/GenericGameStorage.cpp @@ -0,0 +1,348 @@ +#include "common.h" +#include "main.h" +#include "patcher.h" +#include "Camera.h" +#include "Clock.h" +#include "FileMgr.h" +#include "GameLogic.h" +#include "Garages.h" +#include "GenericGameStorage.h" +#include "PCSave.h" +#include "PlayerPed.h" +#include "Pools.h" +#include "Script.h" +#include "Streaming.h" +#include "World.h" + + +char (&DefaultPCSaveFileName)[260] = *(char(*)[260])*(uintptr*)0x8E28C0; +char (&ValidSaveName)[260] = *(char(*)[260])*(uintptr*)0x8E2CBC; +char (&LoadFileName)[256] = *(char(*)[256])*(uintptr*)0x9403C4; +wchar (&SlotFileName)[SLOT_COUNT][260] = *(wchar(*)[SLOT_COUNT][260])*(uintptr*)0x6F07C8; +wchar (&SlotSaveDate)[SLOT_COUNT][70] = *(wchar(*)[SLOT_COUNT][70])*(uintptr*)0x72B858; +int &CheckSum = *(int*)0x8E2BE0; +eLevelName &m_LevelToLoad = *(eLevelName*)0x8E29CC; +char SaveFileNameJustSaved[260]; +int (&Slots)[SLOT_COUNT+1] = *(int(*)[SLOT_COUNT+1])*(uintptr*)0x72803C; +CDate &CompileDateAndTime = *(CDate*)0x72BCB8; + +C_PcSave &PcSaveHelper = *(C_PcSave*)0x8E2C60; + +CDate::CDate() +{ + m_nYear = 0; + m_nSecond = 0; + m_nMinute = 0; + m_nHour = 0; + m_nDay = 0; + m_nMonth = 0; +} + +bool +CDate::operator>(const CDate &right) +{ + if (m_nYear > right.m_nYear) + return true; + if (m_nYear != right.m_nYear) + return false; + + if (m_nMonth > right.m_nMonth) + return true; + if (m_nMonth != right.m_nMonth) + return false; + + if (m_nDay > right.m_nDay) + return true; + if (m_nDay != right.m_nDay) + return false; + + if (m_nHour > right.m_nHour) + return true; + if (m_nHour != right.m_nHour) + return false; + + if (m_nMinute > right.m_nMinute) + return true; + if (m_nMinute != right.m_nMinute) + return false; + return m_nSecond > right.m_nSecond; +} + +bool +CDate::operator<(const CDate &right) +{ + if (m_nYear < right.m_nYear) + return true; + if (m_nYear != right.m_nYear) + return false; + + if (m_nMonth < right.m_nMonth) + return true; + if (m_nMonth != right.m_nMonth) + return false; + + if (m_nDay < right.m_nDay) + return true; + if (m_nDay != right.m_nDay) + return false; + + if (m_nHour < right.m_nHour) + return true; + if (m_nHour != right.m_nHour) + return false; + + if (m_nMinute < right.m_nMinute) + return true; + if (m_nMinute != right.m_nMinute) + return false; + return m_nSecond < right.m_nSecond; +} + +bool +CDate::operator==(const CDate &right) +{ + if (m_nYear != right.m_nYear || m_nMonth != right.m_nMonth || m_nDay != right.m_nDay || m_nHour != right.m_nHour || m_nMinute != right.m_nMinute) + return false; + return m_nSecond == right.m_nSecond; +} + +void +CDate::PopulateDateFields(int8 &second, int8 &minute, int8 &hour, int8 &day, int8 &month, int16 year) +{ + m_nSecond = second; + m_nMinute = minute; + m_nHour = hour; + m_nDay = day; + m_nMonth = month; + m_nYear = year; +} + +WRAPPER bool GenericSave(int file) { EAXJMP(0x58F8D0); } +WRAPPER bool GenericLoad() { EAXJMP(0x590A00); } + +bool +ReadInSizeofSaveFileBuffer(int32 &file, uint32 &size) +{ + file = CFileMgr::OpenFile(LoadFileName, "rb"); + if (file == 0) { + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN; + return false; + } + CFileMgr::Read(file, (const char*)&size, 4); + if (CFileMgr::GetErrorReadWrite(file)) { + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_READ; + if (!CloseFile(file)) + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_CLOSE; + return false; + } + return true; +} + +bool +ReadDataFromFile(int32 file, uint8 *buf, uint32 size) +{ + if (file == 0) { + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN; + return false; + } + size_t read_size = CFileMgr::Read(file, (const char*)buf, size); + if (CFileMgr::GetErrorReadWrite(file) || read_size != size) { + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_READ; + if (!CloseFile(file)) + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_CLOSE; + return false; + } + return true; +} + +bool +CloseFile(int32 file) +{ + return CFileMgr::CloseFile(file) == 0; +} + +void +DoGameSpecificStuffAfterSucessLoad() +{ + StillToFadeOut = true; + JustLoadedDontFadeInYet = true; + CTheScripts::Process(); +} + +bool +CheckSlotDataValid(int32 slot) +{ + PcSaveHelper.nErrorCode = SAVESTATUS_SUCCESSFUL; + if (CheckDataNotCorrupt(slot, LoadFileName)) { + CStreaming::DeleteAllRwObjects(); + return true; + } + + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_DATA_INVALID; + return false; +} + +void +MakeSpaceForSizeInBufferPointer(uint8 *&presize, uint8 *&buf, uint8 *&postsize) +{ + presize = buf; + buf += 4; + postsize = buf; +} + +void +CopySizeAndPreparePointer(uint8 *&buf, uint8 *&postbuf, uint8 *&postbuf2, uint32 &unused, uint32 &size) +{ + *(uint32*)buf = size; + size = align4bytes(size); + postbuf2 += size; + postbuf = postbuf2; +} + +void +DoGameSpecificStuffBeforeSave() +{ + CGameLogic::PassTime(360); + CPlayerPed *ped = FindPlayerPed(); + ped->m_fCurrentStamina = ped->m_fMaxStamina; + CGame::TidyUpMemory(true, false); +} + + +void +MakeValidSaveName(int32 slot) +{ + ValidSaveName[0] = '\0'; + sprintf(ValidSaveName, "%s%i", DefaultPCSaveFileName, slot + 1); + strncat(ValidSaveName, ".b", 5); +} + +wchar * +GetSavedGameDateAndTime(int32 slot) +{ + return SlotSaveDate[slot]; +} + +wchar * +GetNameOfSavedGame(int32 slot) +{ + return SlotFileName[slot]; +} + +bool +CheckDataNotCorrupt(int32 slot, char *name) +{ + char filename[100]; + + int32 blocknum = 0; + eLevelName level = LEVEL_NONE; + CheckSum = 0; + uint32 bytes_pocessed = 0; + sprintf(filename, "%s%i%s", DefaultPCSaveFileName, slot + 1, ".b"); + int file = CFileMgr::OpenFile(filename, "rb"); + if (file == 0) + return false; + strcpy(name, filename); + while (201729 - bytes_pocessed > 4 && blocknum < 40) { + int32 blocksize; + if (!ReadDataFromFile(file, (uint8*)&blocksize, 4)) { + CloseFile(file); + return false; + } + if (blocksize > align4bytes(sizeof(work_buff))) + blocksize = sizeof(work_buff) - 4; + if (!ReadDataFromFile(file, work_buff, align4bytes(blocksize))) { + CloseFile(file); + return false; + } + + CheckSum += ((uint8*)&blocksize)[0]; + CheckSum += ((uint8*)&blocksize)[1]; + CheckSum += ((uint8*)&blocksize)[2]; + CheckSum += ((uint8*)&blocksize)[3]; + uint8 *_work_buf = work_buff; + for (int i = 0; i < align4bytes(blocksize); i++) { + CheckSum += *_work_buf++; + bytes_pocessed++; + } + + if (blocknum == 0) + level = *(eLevelName*)&work_buff[4]; + blocknum++; + } + int32 _checkSum; + if (ReadDataFromFile(file, (uint8*)&_checkSum, 4)) { + if (CloseFile(file)) { + if (CheckSum == _checkSum) { + m_LevelToLoad = level; + return true; + } + return false; + } + return false; + } + + CloseFile(file); + return false; +} + +bool +RestoreForStartLoad() +{ + uint8 buf[999]; + + int file = CFileMgr::OpenFile(LoadFileName, "rb"); + if (file == 0) { + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN; + return false; + } + ReadDataFromFile(file, buf, 999); + if (CFileMgr::GetErrorReadWrite(file)) { + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_READ; + if (!CloseFile(file)) + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_CLOSE; + return false; + } else { + CGame::currLevel = *(eLevelName*)&buf[72]; + TheCamera.GetPosition() = *(CVector*)&buf[76]; + CStreaming::RemoveUnusedBigBuildings(*(eLevelName*)&buf[72]); + CStreaming::RemoveUnusedBuildings(CGame::currLevel); + CCollision::SortOutCollisionAfterLoad(); + CStreaming::RequestBigBuildings(CGame::currLevel); + CStreaming::LoadAllRequestedModels(false); + CStreaming::HaveAllBigBuildingsLoaded(CGame::currLevel); + CGame::TidyUpMemory(true, false); + + if (CloseFile(file)) { + return true; + } else { + PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_CLOSE; + return false; + } + } +} + +int +align4bytes(int32 size) +{ + return (size + 3) & 0xFFFFFFFC; +} + +STARTPATCHES + //InjectHook(0x58F8D0, GenericSave, PATCH_JUMP); + //InjectHook(0x590A00, GenericLoad, PATCH_JUMP); + InjectHook(0x591910, ReadInSizeofSaveFileBuffer, PATCH_JUMP); + InjectHook(0x591990, ReadDataFromFile, PATCH_JUMP); + InjectHook(0x591A00, CloseFile, PATCH_JUMP); + InjectHook(0x591A20, DoGameSpecificStuffAfterSucessLoad, PATCH_JUMP); + InjectHook(0x591A40, CheckSlotDataValid, PATCH_JUMP); + InjectHook(0x591A80, MakeSpaceForSizeInBufferPointer, PATCH_JUMP); + InjectHook(0x591AA0, CopySizeAndPreparePointer, PATCH_JUMP); + InjectHook(0x591AE0, DoGameSpecificStuffBeforeSave, PATCH_JUMP); + InjectHook(0x591B10, MakeValidSaveName, PATCH_JUMP); + InjectHook(0x591B50, GetSavedGameDateAndTime, PATCH_JUMP); + InjectHook(0x591B60, GetNameOfSavedGame, PATCH_JUMP); + InjectHook(0x591B70, CheckDataNotCorrupt, PATCH_JUMP); + InjectHook(0x591D60, RestoreForStartLoad, PATCH_JUMP); + InjectHook(0x591E80, align4bytes, PATCH_JUMP); +ENDPATCHES \ No newline at end of file -- cgit v1.2.3 From c6b6e9d0df11d408a14e7ea7bbe114e4726e23b8 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Tue, 28 Jan 2020 00:16:38 +0200 Subject: CDate separated --- src/save/GenericGameStorage.cpp | 90 +---------------------------------------- 1 file changed, 1 insertion(+), 89 deletions(-) (limited to 'src/save/GenericGameStorage.cpp') diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp index 302b050d..13480b6a 100644 --- a/src/save/GenericGameStorage.cpp +++ b/src/save/GenericGameStorage.cpp @@ -3,6 +3,7 @@ #include "patcher.h" #include "Camera.h" #include "Clock.h" +#include "Date.h" #include "FileMgr.h" #include "GameLogic.h" #include "Garages.h" @@ -28,95 +29,6 @@ CDate &CompileDateAndTime = *(CDate*)0x72BCB8; C_PcSave &PcSaveHelper = *(C_PcSave*)0x8E2C60; -CDate::CDate() -{ - m_nYear = 0; - m_nSecond = 0; - m_nMinute = 0; - m_nHour = 0; - m_nDay = 0; - m_nMonth = 0; -} - -bool -CDate::operator>(const CDate &right) -{ - if (m_nYear > right.m_nYear) - return true; - if (m_nYear != right.m_nYear) - return false; - - if (m_nMonth > right.m_nMonth) - return true; - if (m_nMonth != right.m_nMonth) - return false; - - if (m_nDay > right.m_nDay) - return true; - if (m_nDay != right.m_nDay) - return false; - - if (m_nHour > right.m_nHour) - return true; - if (m_nHour != right.m_nHour) - return false; - - if (m_nMinute > right.m_nMinute) - return true; - if (m_nMinute != right.m_nMinute) - return false; - return m_nSecond > right.m_nSecond; -} - -bool -CDate::operator<(const CDate &right) -{ - if (m_nYear < right.m_nYear) - return true; - if (m_nYear != right.m_nYear) - return false; - - if (m_nMonth < right.m_nMonth) - return true; - if (m_nMonth != right.m_nMonth) - return false; - - if (m_nDay < right.m_nDay) - return true; - if (m_nDay != right.m_nDay) - return false; - - if (m_nHour < right.m_nHour) - return true; - if (m_nHour != right.m_nHour) - return false; - - if (m_nMinute < right.m_nMinute) - return true; - if (m_nMinute != right.m_nMinute) - return false; - return m_nSecond < right.m_nSecond; -} - -bool -CDate::operator==(const CDate &right) -{ - if (m_nYear != right.m_nYear || m_nMonth != right.m_nMonth || m_nDay != right.m_nDay || m_nHour != right.m_nHour || m_nMinute != right.m_nMinute) - return false; - return m_nSecond == right.m_nSecond; -} - -void -CDate::PopulateDateFields(int8 &second, int8 &minute, int8 &hour, int8 &day, int8 &month, int16 year) -{ - m_nSecond = second; - m_nMinute = minute; - m_nHour = hour; - m_nDay = day; - m_nMonth = month; - m_nYear = year; -} - WRAPPER bool GenericSave(int file) { EAXJMP(0x58F8D0); } WRAPPER bool GenericLoad() { EAXJMP(0x590A00); } -- cgit v1.2.3 From 3c550eb679baa073fff588d51f045f660d975e9c Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Fri, 31 Jan 2020 10:12:36 +0200 Subject: sizeofs n stuff --- src/save/GenericGameStorage.cpp | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'src/save/GenericGameStorage.cpp') diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp index 13480b6a..52733b67 100644 --- a/src/save/GenericGameStorage.cpp +++ b/src/save/GenericGameStorage.cpp @@ -15,6 +15,7 @@ #include "Streaming.h" #include "World.h" +const int SIZE_OF_ONE_GAME_IN_BYTES = 201729; char (&DefaultPCSaveFileName)[260] = *(char(*)[260])*(uintptr*)0x8E28C0; char (&ValidSaveName)[260] = *(char(*)[260])*(uintptr*)0x8E2CBC; @@ -29,6 +30,9 @@ CDate &CompileDateAndTime = *(CDate*)0x72BCB8; C_PcSave &PcSaveHelper = *(C_PcSave*)0x8E2C60; +#define ReadDataFromBufferPointer(buf, to) memcpy(&to, buf, sizeof(to)); buf += align4bytes(sizeof(to)); +#define WriteDataToBufferPointer(buf, from) memcpy(buf, &from, sizeof(from)); buf += align4bytes(sizeof(from)); + WRAPPER bool GenericSave(int file) { EAXJMP(0x58F8D0); } WRAPPER bool GenericLoad() { EAXJMP(0x590A00); } @@ -40,7 +44,7 @@ ReadInSizeofSaveFileBuffer(int32 &file, uint32 &size) PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN; return false; } - CFileMgr::Read(file, (const char*)&size, 4); + CFileMgr::Read(file, (const char*)&size, sizeof(size)); if (CFileMgr::GetErrorReadWrite(file)) { PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_READ; if (!CloseFile(file)) @@ -98,14 +102,14 @@ void MakeSpaceForSizeInBufferPointer(uint8 *&presize, uint8 *&buf, uint8 *&postsize) { presize = buf; - buf += 4; + buf += sizeof(uint32); postsize = buf; } void CopySizeAndPreparePointer(uint8 *&buf, uint8 *&postbuf, uint8 *&postbuf2, uint32 &unused, uint32 &size) { - *(uint32*)buf = size; + memcpy(buf, &size, sizeof(size)); size = align4bytes(size); postbuf2 += size; postbuf = postbuf2; @@ -155,14 +159,14 @@ CheckDataNotCorrupt(int32 slot, char *name) if (file == 0) return false; strcpy(name, filename); - while (201729 - bytes_pocessed > 4 && blocknum < 40) { + while (SIZE_OF_ONE_GAME_IN_BYTES - sizeof(uint32) - bytes_pocessed > 0 && blocknum < 40) { int32 blocksize; - if (!ReadDataFromFile(file, (uint8*)&blocksize, 4)) { + if (!ReadDataFromFile(file, (uint8*)&blocksize, sizeof(blocksize))) { CloseFile(file); return false; } if (blocksize > align4bytes(sizeof(work_buff))) - blocksize = sizeof(work_buff) - 4; + blocksize = sizeof(work_buff) - sizeof(uint32); if (!ReadDataFromFile(file, work_buff, align4bytes(blocksize))) { CloseFile(file); return false; @@ -179,11 +183,11 @@ CheckDataNotCorrupt(int32 slot, char *name) } if (blocknum == 0) - level = *(eLevelName*)&work_buff[4]; + memcpy(&level, work_buff+4, sizeof(level)); blocknum++; } int32 _checkSum; - if (ReadDataFromFile(file, (uint8*)&_checkSum, 4)) { + if (ReadDataFromFile(file, (uint8*)&_checkSum, sizeof(_checkSum))) { if (CloseFile(file)) { if (CheckSum == _checkSum) { m_LevelToLoad = level; @@ -208,16 +212,19 @@ RestoreForStartLoad() PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_OPEN; return false; } - ReadDataFromFile(file, buf, 999); + ReadDataFromFile(file, buf, sizeof(buf)); if (CFileMgr::GetErrorReadWrite(file)) { PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_READ; if (!CloseFile(file)) PcSaveHelper.nErrorCode = SAVESTATUS_ERR_LOAD_CLOSE; return false; } else { - CGame::currLevel = *(eLevelName*)&buf[72]; - TheCamera.GetPosition() = *(CVector*)&buf[76]; - CStreaming::RemoveUnusedBigBuildings(*(eLevelName*)&buf[72]); + uint8 *_buf = buf + sizeof(int32) + sizeof(wchar[24]) + sizeof(SYSTEMTIME) + sizeof(SIZE_OF_ONE_GAME_IN_BYTES); + ReadDataFromBufferPointer(_buf, CGame::currLevel); + ReadDataFromBufferPointer(_buf, TheCamera.GetPosition().x); + ReadDataFromBufferPointer(_buf, TheCamera.GetPosition().y); + ReadDataFromBufferPointer(_buf, TheCamera.GetPosition().z); + CStreaming::RemoveUnusedBigBuildings(CGame::currLevel); CStreaming::RemoveUnusedBuildings(CGame::currLevel); CCollision::SortOutCollisionAfterLoad(); CStreaming::RequestBigBuildings(CGame::currLevel); -- cgit v1.2.3