Merge branch 'master' into Radar2

src/audio/AudioScriptObject.cpp

@@ -3,6 +3,8 @@
 #include "AudioScriptObject.h"
 #include "Pools.h"
 
+WRAPPER void cAudioScriptObject::SaveAllAudioScriptObjects(uint8 *buf, uint32 *size) { EAXJMP(0x57c460); }
+
 void
 cAudioScriptObject::Reset()
 {

src/audio/AudioScriptObject.h

@@ -141,6 +141,8 @@ class cAudioScriptObject
 	static void* operator new(size_t, int);
 	static void operator delete(void*, size_t);
 	static void operator delete(void*, int);
+
+	static void SaveAllAudioScriptObjects(uint8 *buf, uint32 *size);
 };
 
 static_assert(sizeof(cAudioScriptObject) == 20, "cAudioScriptObject: error");

src/control/Cranes.cpp

@@ -9,4 +9,6 @@ WRAPPER bool CCranes::HaveAllCarsBeenCollectedByMilitaryCrane() { EAXJMP(0x544BE
 WRAPPER void CCranes::ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float) { EAXJMP(0x543650); }
 WRAPPER void CCranes::DeActivateCrane(float, float) { EAXJMP(0x543890); }
 WRAPPER void CCranes::InitCranes(void) { EAXJMP(0x543360); }
-WRAPPER void CCranes::UpdateCranes(void) { EAXJMP(0x5439E0); }
+WRAPPER void CCranes::UpdateCranes(void) { EAXJMP(0x5439E0); }
+WRAPPER void CCranes::Save(uint8*, uint32*) { EAXJMP(0x545210); }
+WRAPPER void CranesLoad(uint8*, uint32) { EAXJMP(0x5454d0); }

src/control/Cranes.h

@@ -14,4 +14,7 @@ class CCranes
 	static void DeActivateCrane(float, float);
 	static void InitCranes(void);
 	static void UpdateCranes(void);
+	static void Save(uint8*, uint32*);
 };
+
+void CranesLoad(uint8*, uint32);	// is this really outside CCranes?

src/control/Garages.cpp

@@ -31,6 +31,8 @@ CGarage(&CGarages::Garages)[NUM_GARAGES] = *(CGarage(*)[NUM_GARAGES])(uintptr*)0
 
 WRAPPER void CGarages::Init(void) { EAXJMP(0x421C60); }
 WRAPPER void CGarages::Update(void) { EAXJMP(0x421E40); }
+WRAPPER void CGarages::Load(uint8* buf, uint32 size) { EAXJMP(0x428940); }
+WRAPPER void CGarages::Save(uint8* buf, uint32 *size) { EAXJMP(0x4284e0); }
 
 bool
 CGarages::IsModelIndexADoor(uint32 id)

src/control/Garages.h

@@ -147,6 +147,8 @@ class CGarages
 	static void PlayerArrestedOrDied();
 	static void Init(void);
 	static void Update(void);
+	static void Load(uint8 *buf, uint32 size);
+	static void Save(uint8 *buf, uint32 *size);
 	static int16 AddOne(float, float, float, float, float, float, uint8, uint32);
 	static void SetTargetCarForMissonGarage(int16, CVehicle*);
 	static bool HasCarBeenDroppedOffYet(int16);