a3x
/
re3
mirror of https://git.rip/DMCA_FUCKER/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

saves

This commit is contained in:
Nikolay Korolev 2021-01-19 23:34:37 +03:00
parent 061fd25c61
commit dac4dd560a
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/control/Script5.cpp
View File

@ -2222,9 +2222,13 @@ INITSAVEBUF
script_assert(ReadSaveBuf<uint32>(buf) == SCRIPT_DATA_SIZE);
OnAMissionFlag = ReadSaveBuf<uint32>(buf);
LastMissionPassedTime = ReadSaveBuf<uint32>(buf);
for (uint32 i = 0; i < MAX_NUM_COLLECTIVES; i++)
CollectiveArray[i] = ReadSaveBuf<tCollectiveData>(buf);
NextFreeCollectiveIndex = ReadSaveBuf<int32>(buf);
for (uint32 i = 0; i < MAX_NUM_BUILDING_SWAPS; i++) {
uint32 type = ReadSaveBuf<uint32>(buf);
uint32 handle = ReadSaveBuf<uint32>(buf);
/*
switch (type) {
case 0:
BuildingSwapArray[i].m_pBuilding = nil;
@ -2238,14 +2242,18 @@ INITSAVEBUF
default:
script_assert(false);
}
BuildingSwapArray[i].m_nNewModel = ReadSaveBuf<uint32>(buf);
BuildingSwapArray[i].m_nOldModel = ReadSaveBuf<uint32>(buf);
*/
/*BuildingSwapArray[i].m_nNewModel = */ReadSaveBuf<uint32>(buf);
/*BuildingSwapArray[i].m_nOldModel = */ReadSaveBuf<uint32>(buf);
/*
if (BuildingSwapArray[i].m_pBuilding)
BuildingSwapArray[i].m_pBuilding->ReplaceWithNewModel(BuildingSwapArray[i].m_nNewModel);
*/
}
for (uint32 i = 0; i < MAX_NUM_INVISIBILITY_SETTINGS; i++) {
uint32 type = ReadSaveBuf<uint32>(buf);
uint32 handle = ReadSaveBuf<uint32>(buf);
/*
switch (type) {
case 0:
InvisibilitySettingArray[i] = nil;
@ -2267,9 +2275,10 @@ INITSAVEBUF
}
if (InvisibilitySettingArray[i])
InvisibilitySettingArray[i]->bIsVisible = false;
*/
}
script_assert(ReadSaveBuf<bool>(buf) == bUsingAMultiScriptFile);
bPlayerHasMetDebbieHarry = ReadSaveBuf<uint8>(buf);
/*bPlayerHasMetDebbieHarry = */ReadSaveBuf<uint8>(buf);
ReadSaveBuf<uint16>(buf);
script_assert(ReadSaveBuf<uint32>(buf) == MainScriptSize);
script_assert(ReadSaveBuf<uint32>(buf) == LargestMissionScriptSize);

6
src/core/Frontend.cpp
View File

@ -3369,9 +3369,9 @@ CMenuManager::Process(void)
#ifdef XBOX_MESSAGE_SCREEN
ProcessDialogTimer();
#endif
if (TheCamera.GetScreenFadeStatus() != FADE_0)
return;
// tmp hack to get saving to work
//if (TheCamera.GetScreenFadeStatus() != FADE_0)
// return;
InitialiseChangedLanguageSettings();