Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

sizeofs n stuff

Browse Source
This commit is contained in:
Sergeanur 2020-01-31 10:12:36 +02:00
parent c6b6e9d0df
commit 3c550eb679
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/save/GenericGameStorage.cpp
View File

@ -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);

19
src/save/PCSave.cpp
View File

@ -50,7 +50,7 @@ C_PcSave::SaveSlot(int32 slot)
bool
C_PcSave::PcClassSaveRoutine(int32 file, uint8 *data, uint32 size)
{
CFileMgr::Write(file, (const char*)&size, 4);
CFileMgr::Write(file, (const char*)&size, sizeof(size));
if (CFileMgr::GetErrorReadWrite(file)) {
nErrorCode = SAVESTATUS_ERR_SAVE_WRITE;
strncpy(SaveFileNameJustSaved, ValidSaveName, 259);
@ -84,14 +84,18 @@ C_PcSave::PopulateSlotInfo()
}
for (int i = 0; i < SLOT_COUNT; i++) {
char savename[52];
int8 data[68];
struct {
int size;
wchar FileName[24];
_SYSTEMTIME SaveDateTime;
} header;
sprintf(savename, "%s%i%s", DefaultPCSaveFileName, i + 1, ".b");
int file = CFileMgr::OpenFile(savename, "rb");
if (file != 0) {
CFileMgr::Read(file, (char*)data, 68);
if (strncmp((char*)data, TopLineEmptyFile, sizeof(TopLineEmptyFile)-1)) {
CFileMgr::Read(file, (char*)&header, sizeof(header));
if (strncmp((char*)&header, TopLineEmptyFile, sizeof(TopLineEmptyFile)-1) != 0) {
Slots[i + 1] = SLOT_OK;
memcpy(SlotFileName[i], &data[4], 24 * sizeof(wchar));
memcpy(SlotFileName[i], &header.FileName, sizeof(header.FileName));
SlotFileName[i][24] = '\0';
}
@ -99,9 +103,10 @@ C_PcSave::PopulateSlotInfo()
}
if (Slots[i + 1] == SLOT_OK) {
if (CheckDataNotCorrupt(i, savename)) {
_SYSTEMTIME st = *(_SYSTEMTIME*)&data[52];
_SYSTEMTIME st;
memcpy(&st, &header.SaveDateTime, sizeof(_SYSTEMTIME));
const char *month;
switch (*(uint16*)&data[54])
switch (st.wMonth)
{
case 1: month = "JAN"; break;
case 2: month = "FEB"; break;