diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-06-28 02:59:07 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-28 04:12:54 +0200 |
| commit | f8297df9c5a7d65d5658d1a8d85d391fbb15b95a (patch) | |
| tree | 9dcfac13fc3be99320ca7b546c4ff2007bff4121 /src/peds | |
| parent | Remove waiting for stream closure in multi-thread audio (diff) | |
| download | re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar.gz re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar.bz2 re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar.lz re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar.xz re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar.zst re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Gangs.cpp | 3 | ||||
| -rw-r--r-- | src/peds/Ped.cpp | 1 | ||||
| -rw-r--r-- | src/peds/PedType.cpp | 3 | ||||
| -rw-r--r-- | src/peds/PlayerPed.cpp | 1 |
4 files changed, 6 insertions, 2 deletions
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 |