Revert "Redo ReadSaveBuf + common.h cleanup"

This reverts commit 2b67aba94c.
This commit is contained in:
erorcun
2021-06-26 00:25:59 +03:00
parent 4bab6d5356
commit af7573ddbe
26 changed files with 337 additions and 398 deletions

View File

@ -3,7 +3,6 @@
#include "ModelIndices.h"
#include "Gangs.h"
#include "Weapon.h"
#include "SaveBuf.h"
CGangInfo CGangs::Gang[NUM_GANGS];
@ -73,6 +72,6 @@ INITSAVEBUF
CheckSaveHeader(buf, 'G','N','G','\0', size - SAVE_HEADER_SIZE);
for (int i = 0; i < NUM_GANGS; i++)
ReadSaveBuf(&Gang[i], buf);
Gang[i] = ReadSaveBuf<CGangInfo>(buf);
VALIDATESAVEBUF(size);
}

View File

@ -32,7 +32,6 @@
#include "Floater.h"
#include "Range2D.h"
#include "Wanted.h"
#include "SaveBuf.h"
CPed *gapTempPedList[50];
uint16 gnNumTempPedList;

View File

@ -3,7 +3,6 @@
#include "General.h"
#include "FileMgr.h"
#include "PedType.h"
#include "SaveBuf.h"
CPedType *CPedType::ms_apPedType[NUM_PEDTYPES];
CPedStats *CPedStats::ms_apPedStats[NUM_PEDSTATS];
@ -202,7 +201,7 @@ INITSAVEBUF
CheckSaveHeader(buf, 'P', 'T', 'P', '\0', size - SAVE_HEADER_SIZE);
for(int i = 0; i < NUM_PEDTYPES; i++)
ReadSaveBuf(ms_apPedType[i], buf);
*ms_apPedType[i] = ReadSaveBuf<CPedType>(buf);
VALIDATESAVEBUF(size)
}

View File

@ -16,7 +16,6 @@
#include "Pools.h"
#include "Darkel.h"
#include "CarCtrl.h"
#include "SaveBuf.h"
#define PAD_MOVE_TO_GAME_WORLD_MOVE 60.0f