diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-19 23:34:37 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-19 23:34:37 +0300 |
| commit | dac4dd560a60d306694833d367e9ae57ca1ff8c9 (patch) | |
| tree | 299e567da0d6a2ea1389499a6e96843a08de74d2 | |
| parent | 061fd25c6117c57785f044d5e113222f99768255 (diff) | |
saves
| -rw-r--r-- | src/control/Script5.cpp | 15 | ||||
| -rw-r--r-- | src/core/Frontend.cpp | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp index bddcac62..9fca2cc0 100644 --- a/src/control/Script5.cpp +++ b/src/control/Script5.cpp @@ -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); diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 62e2e65f..b824fafa 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -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(); |