From 8705562559c37d44f113ad71adf09e4b1ace3523 Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Sun, 24 May 2020 15:58:25 +0300
Subject: [PATCH] how did saving even work in original III?

---
 src/control/Garages.cpp | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index a177343b..615ba77f 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -2119,12 +2119,8 @@ void CGarages::SetAllDoorsBackToOriginalHeight()
 // TODO(MIAMI)
 void CGarages::Save(uint8 * buf, uint32 * size)
 {
-#ifdef FIX_GARAGE_SIZE
-	INITSAVEBUF
-	*size = (6 * sizeof(uint32) + TOTAL_COLLECTCARS_GARAGES * sizeof(*CarTypesCollected) + sizeof(uint32) + 3 * NUM_GARAGE_STORED_CARS * sizeof(CStoredCar) + NUM_GARAGES * sizeof(CGarage));
-#else
-	* size = 5484;
-#endif
+INITSAVEBUF
+	*size = (6 * sizeof(uint32) + TOTAL_COLLECTCARS_GARAGES * sizeof(*CarTypesCollected) + sizeof(uint32) + TOTAL_HIDEOUT_GARAGES * NUM_GARAGE_STORED_CARS * sizeof(CStoredCar) + NUM_GARAGES * sizeof(CGarage));
 	CloseHideOutGaragesBeforeSave();
 	WriteSaveBuf(buf, NumGarages);
 	WriteSaveBuf(buf, (uint32)BombsAreFree);
@@ -2142,9 +2138,7 @@ void CGarages::Save(uint8 * buf, uint32 * size)
 	}
 	for (int i = 0; i < NUM_GARAGES; i++)
 		WriteSaveBuf(buf, aGarages[i]);
-#ifdef FIX_GARAGE_SIZE
-	VALIDATESAVEBUF(*size);
-#endif
+VALIDATESAVEBUF(*size);
 }
 
 const CStoredCar &CStoredCar::operator=(const CStoredCar & other)
@@ -2169,12 +2163,8 @@ const CStoredCar &CStoredCar::operator=(const CStoredCar & other)
 //TODO(MIAMI)
 void CGarages::Load(uint8* buf, uint32 size)
 {
-#ifdef FIX_GARAGE_SIZE
-	INITSAVEBUF
-	assert(size == (6 * sizeof(uint32) + TOTAL_COLLECTCARS_GARAGES * sizeof(*CarTypesCollected) + sizeof(uint32) + 3 * NUM_GARAGE_STORED_CARS * sizeof(CStoredCar) + NUM_GARAGES * sizeof(CGarage));
-#else
-	assert(size == 5484);
-#endif
+INITSAVEBUF
+	assert(size == (6 * sizeof(uint32) + TOTAL_COLLECTCARS_GARAGES * sizeof(*CarTypesCollected) + sizeof(uint32) + TOTAL_HIDEOUT_GARAGES * NUM_GARAGE_STORED_CARS * sizeof(CStoredCar) + NUM_GARAGES * sizeof(CGarage)));
 	CloseHideOutGaragesBeforeSave();
 	NumGarages = ReadSaveBuf<uint32>(buf);
 	BombsAreFree = ReadSaveBuf<uint32>(buf);
@@ -2203,9 +2193,7 @@ void CGarages::Load(uint8* buf, uint32 size)
 		else
 			aGarages[i].UpdateDoorsHeight();
 	}
-#ifdef FIX_GARAGE_SIZE
-	VALIDATESAVEBUF(size);
-#endif
+VALIDATESAVEBUF(size);
 
 	MessageEndTime = 0;
 	bCamShouldBeOutisde = false;