diff --git a/Windows_Libs/Dev/Storage/STO_DLC.cpp b/Windows_Libs/Dev/Storage/STO_DLC.cpp index 6cfde3c..da5f5bc 100644 --- a/Windows_Libs/Dev/Storage/STO_DLC.cpp +++ b/Windows_Libs/Dev/Storage/STO_DLC.cpp @@ -9,9 +9,10 @@ XCONTENT_DATA& CDLC::GetDLC(DWORD dw) CDLC::CDLC(void) : m_vInstalledDLCs(), m_szMountPath(), m_vDLCDriveMappings() { - m_iHasNewInstalledDLCs = 0; + m_iHasNewInstalledDLCs = false; dword0 = 0; dwordC0 = 0; + m_iHasNewMountedDLCs = false; // @Patoke fix ZeroMemory(m_szDLCProductCode, sizeof(m_szDLCProductCode)); ZeroMemory(m_szProductUpgradeKey, sizeof(m_szProductUpgradeKey)); diff --git a/Windows_Libs/Dev/Storage/STO_DLC.h b/Windows_Libs/Dev/Storage/STO_DLC.h index f94eff4..bf3286c 100644 --- a/Windows_Libs/Dev/Storage/STO_DLC.h +++ b/Windows_Libs/Dev/Storage/STO_DLC.h @@ -49,10 +49,7 @@ public: std::string m_szMountPath; DWORD m_uiCurrentMappedDLC; DWORD dword94; - char* m_szPackageRoot; - BYTE gapA0[16]; - DWORD dwordB0; - BYTE gapC0[12]; + char m_szPackageRoot[40]; DWORD dwordC0; std::vector m_vDLCDriveMappings; char m_szDLCProductCode[16]; diff --git a/Windows_Libs/Dev/Storage/STO_SaveGame.cpp b/Windows_Libs/Dev/Storage/STO_SaveGame.cpp index dbbc634..65eacc5 100644 --- a/Windows_Libs/Dev/Storage/STO_SaveGame.cpp +++ b/Windows_Libs/Dev/Storage/STO_SaveGame.cpp @@ -175,7 +175,7 @@ C4JStorage::ESaveGameState CSaveGame::LoadSaveData(PSAVE_INFO pSaveInfo, int(*Fu { DWORD bytesRead = 0; BOOL res = ReadFile(h, m_pSaveData, m_uiSaveSize, &bytesRead, 0); - _ASSERT(!res || bytesRead != m_uiSaveSize); + _ASSERT(res && bytesRead == m_uiSaveSize); CloseHandle(h); success = true; } @@ -254,7 +254,7 @@ C4JStorage::ESaveGameState CSaveGame::SaveSaveData(int(*Func)(LPVOID, const bool DWORD bytesWritten = 0; BOOL res = WriteFile(h, m_pSaveData, m_uiSaveSize, &bytesWritten, 0); - _ASSERT(!res || bytesWritten != m_uiSaveSize); + _ASSERT(res && bytesWritten == m_uiSaveSize); CloseHandle(h);