From 28342405d37ae28fdf98546753e89d683480914f Mon Sep 17 00:00:00 2001 From: Wes Hampson Date: Tue, 10 Mar 2020 20:25:50 -0700 Subject: Add Load/Save functions --- src/control/Cranes.cpp | 4 +++- src/control/Cranes.h | 3 +++ src/control/Garages.cpp | 2 ++ src/control/Garages.h | 2 ++ src/control/Script.cpp | 4 ++-- 5 files changed, 12 insertions(+), 3 deletions(-) (limited to 'src/control') diff --git a/src/control/Cranes.cpp b/src/control/Cranes.cpp index c8d64077..4c1bf2c8 100644 --- a/src/control/Cranes.cpp +++ b/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); } \ No newline at end of file +WRAPPER void CCranes::UpdateCranes(void) { EAXJMP(0x5439E0); } +WRAPPER void CCranes::Save(uint8*, uint32*) { EAXJMP(0x545210); } +WRAPPER void CranesLoad(uint8*, uint32) { EAXJMP(0x5454d0); } diff --git a/src/control/Cranes.h b/src/control/Cranes.h index 4625463e..9f606c9f 100644 --- a/src/control/Cranes.h +++ b/src/control/Cranes.h @@ -14,4 +14,7 @@ public: 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? diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index 8270780d..9f300257 100644 --- a/src/control/Garages.cpp +++ b/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) diff --git a/src/control/Garages.h b/src/control/Garages.h index fe0d1a20..5e106ade 100644 --- a/src/control/Garages.h +++ b/src/control/Garages.h @@ -147,6 +147,8 @@ public: 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); diff --git a/src/control/Script.cpp b/src/control/Script.cpp index b8add76a..96835aef 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -11212,8 +11212,8 @@ void CTheScripts::RenderTheScriptDebugLines() RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)0); } -WRAPPER void CTheScripts::SaveAllScripts(uint8*, uint32*) { EAXJMP(0x4535E0); } -WRAPPER void CTheScripts::LoadAllScripts(uint8*, uint32) { EAXJMP(0x453B30); } +WRAPPER void CTheScripts::SaveAllScripts(uint8 *buf, uint32 *size) { EAXJMP(0x4535E0); } +WRAPPER void CTheScripts::LoadAllScripts(uint8 *buf, uint32 size) { EAXJMP(0x453B30); } WRAPPER void CTheScripts::ClearSpaceForMissionEntity(const CVector&, CEntity*) { EAXJMP(0x454060); } WRAPPER void CTheScripts::HighlightImportantArea(uint32, float, float, float, float, float) { EAXJMP(0x454320); } WRAPPER void CTheScripts::HighlightImportantAngledArea(uint32, float, float, float, float, float, float, float, float, float) { EAXJMP(0x454430); } -- cgit v1.2.3