summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWes Hampson <thehambone93@gmail.com>2020-03-05 10:44:42 +0100
committerWes Hampson <thehambone93@gmail.com>2020-03-05 10:44:42 +0100
commit4fee2cbdd9948bd591d6e5bebd4bed827e12498a (patch)
tree3945023a001fa233b5341133cfc52d0dc9eb450f
parentMerge pull request #342 from Nick007J/master (diff)
downloadre3-4fee2cbdd9948bd591d6e5bebd4bed827e12498a.tar
re3-4fee2cbdd9948bd591d6e5bebd4bed827e12498a.tar.gz
re3-4fee2cbdd9948bd591d6e5bebd4bed827e12498a.tar.bz2
re3-4fee2cbdd9948bd591d6e5bebd4bed827e12498a.tar.lz
re3-4fee2cbdd9948bd591d6e5bebd4bed827e12498a.tar.xz
re3-4fee2cbdd9948bd591d6e5bebd4bed827e12498a.tar.zst
re3-4fee2cbdd9948bd591d6e5bebd4bed827e12498a.zip
Diffstat (limited to '')
-rw-r--r--src/core/Radar.cpp4
-rw-r--r--src/core/Radar.h2
-rw-r--r--src/save/GenericGameStorage.cpp84
3 files changed, 86 insertions, 4 deletions
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 6a1446da..3a706bad 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -946,9 +946,9 @@ void CRadar::RequestMapSection(int32 x, int32 y)
#endif
#if 1
-WRAPPER void CRadar::SaveAllRadarBlips(int32) { EAXJMP(0x4A6E30); }
+WRAPPER void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size) { EAXJMP(0x4A6E30); }
#else
-void CRadar::SaveAllRadarBlips(int32)
+void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size)
{
}
diff --git a/src/core/Radar.h b/src/core/Radar.h
index 650c6fb4..5b2174d7 100644
--- a/src/core/Radar.h
+++ b/src/core/Radar.h
@@ -130,7 +130,7 @@ public:
static void RemoveRadarSections();
static void RemoveMapSection(int32 x, int32 y);
static void RequestMapSection(int32 x, int32 y);
- static void SaveAllRadarBlips(int32);
+ static void SaveAllRadarBlips(uint8 *buf, uint32 *size);
static void SetBlipSprite(int32 i, int32 icon);
static int32 SetCoordBlip(eBlipType type, CVector pos, int32, eBlipDisplay);
static int32 SetEntityBlip(eBlipType type, int32, int32, eBlipDisplay);
diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp
index 5a55dbd5..6880915d 100644
--- a/src/save/GenericGameStorage.cpp
+++ b/src/save/GenericGameStorage.cpp
@@ -2,18 +2,27 @@
#include "main.h"
#include "patcher.h"
#include "Camera.h"
+#include "CarGen.h"
#include "Clock.h"
#include "Date.h"
#include "FileMgr.h"
#include "GameLogic.h"
+#include "Gangs.h"
#include "Garages.h"
#include "GenericGameStorage.h"
+#include "PathFind.h"
#include "PCSave.h"
+#include "Phones.h"
+#include "Pickups.h"
#include "PlayerPed.h"
#include "Pools.h"
+#include "Radar.h"
+#include "Restart.h"
#include "Script.h"
+#include "Stats.h"
#include "Streaming.h"
#include "World.h"
+#include "Zones.h"
const int SIZE_OF_ONE_GAME_IN_BYTES = 201729;
@@ -31,10 +40,83 @@ CDate &CompileDateAndTime = *(CDate*)0x72BCB8;
#define ReadDataFromBufferPointer(buf, to) memcpy(&to, buf, sizeof(to)); buf += align4bytes(sizeof(to));
#define WriteDataToBufferPointer(buf, from) memcpy(buf, &from, sizeof(from)); buf += align4bytes(sizeof(from));
-WRAPPER bool GenericSave(int file) { EAXJMP(0x58F8D0); }
+//WRAPPER bool GenericSave(int file) { EAXJMP(0x58F8D0); }
WRAPPER bool GenericLoad() { EAXJMP(0x590A00); }
bool
+GenericSave(int file)
+{
+ /*char *tmpSaveName;
+ wchar saveName[24];
+ SYSTEMTIME saveTime;*/
+
+ // TODO: Use GetLastMissionPassedName() to get this
+ //tmpSaveName = CStats::LastMissionPassedName;
+
+ //AsciiToUnicode(tmpSaveName, saveName);
+
+ //// TODO: some stuff here
+
+ //memcpy(work_buff, saveName, 0x30);
+ //GetLocalTime((SYSTEMTIME *)(work_buff + 0x30));
+ //*((uint32 *)(work_buff + 0x40)) = SIZE_OF_ONE_GAME_IN_BYTES;
+ //*((uint32 *)(work_buff + 0x44)) = CGame::currLevel;
+ //
+ //PcSaveHelper.PcClassSaveRoutine(file, work_buff, 0xE8);
+
+
+ uint8 *buf;
+ uint8 *tmpbuf;
+ uint8 *postsize;
+ uint32 size;
+ uint32 reserved;
+ bool result;
+
+ // TODO: simplevars and scripts
+
+ for (int i = 1; i < 19; i++) {
+ buf = work_buff;
+ size = 0;
+ reserved = 0;
+ MakeSpaceForSizeInBufferPointer(tmpbuf, buf, postsize);
+ switch (i) {
+ case 1: break;
+ case 2: break;
+ case 3: break;
+ case 4: break;
+ case 5: ThePaths.Save(buf, &size); break;
+ case 6: break;
+ case 7: CPickups::Save(buf, &size); break;
+ case 8: gPhoneInfo.Save(buf, &size); break;
+ case 9: CRestart::SaveAllRestartPoints(buf, &size); break;
+ case 10: CRadar::SaveAllRadarBlips(buf, &size); break;
+ case 11: CTheZones::SaveAllZones(buf, &size); break;
+ case 12: CGangs::SaveAllGangData(buf, &size); break;
+ case 13: CTheCarGenerators::SaveAllCarGenerators(buf, &size); break;
+ case 14: break;
+ case 15: break;
+ case 16: break;
+ case 17: break;
+ case 18: break;
+ case 19: break;
+ }
+
+ CopySizeAndPreparePointer(tmpbuf, buf, postsize, reserved, size);
+ result = PcSaveHelper.PcClassSaveRoutine(file, work_buff, size);
+ if (!result)
+ {
+ return false;
+ }
+ }
+
+
+
+ // TODO: padding
+
+ return true;
+}
+
+bool
ReadInSizeofSaveFileBuffer(int32 &file, uint32 &size)
{
file = CFileMgr::OpenFile(LoadFileName, "rb");