From f8297df9c5a7d65d5658d1a8d85d391fbb15b95a Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Mon, 28 Jun 2021 03:59:07 +0300
Subject: Redo ReadSaveBuf + common.h cleanup

---
 src/peds/Gangs.cpp     | 3 ++-
 src/peds/Ped.cpp       | 1 +
 src/peds/PedType.cpp   | 3 ++-
 src/peds/PlayerPed.cpp | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/peds')

diff --git a/src/peds/Gangs.cpp b/src/peds/Gangs.cpp
index 2d6d1137..240f6b37 100644
--- a/src/peds/Gangs.cpp
+++ b/src/peds/Gangs.cpp
@@ -5,6 +5,7 @@
 #include "General.h"
 #include "Streaming.h"
 #include "Weapon.h"
+#include "SaveBuf.h"
 
 CGangInfo CGangs::Gang[NUM_GANGS];
 bool CGangs::GangAttackWithCops[NUM_GANGS];
@@ -119,6 +120,6 @@ INITSAVEBUF
 	CheckSaveHeader(buf, 'G','N','G','\0', size - SAVE_HEADER_SIZE);
 
 	for (int i = 0; i < NUM_GANGS; i++)
-		Gang[i] = ReadSaveBuf<CGangInfo>(buf);
+		ReadSaveBuf(&Gang[i], buf);
 VALIDATESAVEBUF(size);
 }
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 919359d4..e07b5dd4 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -39,6 +39,7 @@
 #include "CutsceneShadow.h"
 #include "Clock.h"
 #include "Wanted.h"
+#include "SaveBuf.h"
 
 CPed *gapTempPedList[50];
 uint16 gnNumTempPedList;
diff --git a/src/peds/PedType.cpp b/src/peds/PedType.cpp
index bacb1a78..dcd4c717 100644
--- a/src/peds/PedType.cpp
+++ b/src/peds/PedType.cpp
@@ -3,6 +3,7 @@
 #include "General.h"
 #include "FileMgr.h"
 #include "PedType.h"
+#include "SaveBuf.h"
 
 CPedType *CPedType::ms_apPedType[NUM_PEDTYPES];
 CPedStats *CPedStats::ms_apPedStats[NUM_PEDSTATS];
@@ -201,7 +202,7 @@ INITSAVEBUF
 	CheckSaveHeader(buf, 'P', 'T', 'P', '\0', size - SAVE_HEADER_SIZE);
 
 	for(int i = 0; i < NUM_PEDTYPES; i++)
-		*ms_apPedType[i] = ReadSaveBuf<CPedType>(buf);
+		ReadSaveBuf(ms_apPedType[i], buf);
 VALIDATESAVEBUF(size)
 }
 
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 4ff4e575..b4e7f647 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -23,6 +23,7 @@
 #include "Replay.h"
 #include "PedPlacement.h"
 #include "VarConsole.h"
+#include "SaveBuf.h"
 
 #define PAD_MOVE_TO_GAME_WORLD_MOVE 60.0f
 
-- 
cgit v1.2.3