CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement

src/peds/Gangs.cpp

@@ -0,0 +1,87 @@
+#include "common.h"
+#include "patcher.h"
+#include "ModelIndices.h"
+#include "Gangs.h"
+#include "Weapon.h"
+
+CGangInfo CGangs::Gang[NUM_GANGS];
+
+CGangInfo::CGangInfo() :
+	m_nVehicleMI(MI_BUS),
+	m_nPedModelOverride(-1),
+	m_Weapon1(WEAPONTYPE_UNARMED),
+	m_Weapon2(WEAPONTYPE_UNARMED)
+{}
+
+void CGangs::Initialise(void)
+{
+	Gang[GANG_MAFIA].m_nVehicleMI = MI_MAFIA;
+	Gang[GANG_TRIAD].m_nVehicleMI = MI_BELLYUP;
+	Gang[GANG_DIABLOS].m_nVehicleMI = MI_DIABLOS;
+	Gang[GANG_YAKUZA].m_nVehicleMI = MI_YAKUZA;
+	Gang[GANG_YARDIE].m_nVehicleMI = MI_YARDIE;
+	Gang[GANG_COLUMB].m_nVehicleMI = MI_COLUMB;
+	Gang[GANG_HOODS].m_nVehicleMI = MI_HOODS;
+	Gang[GANG_7].m_nVehicleMI = -1;
+	Gang[GANG_8].m_nVehicleMI = -1;
+#ifdef FIX_BUGS
+	for (int i = 0; i < NUM_GANGS; i++)
+		Gang[i].m_nPedModelOverride = -1;
+#endif
+}
+
+void CGangs::SetGangVehicleModel(int16 gang, int32 model)
+{
+	GetGangInfo(gang)->m_nVehicleMI = model;
+}
+
+void CGangs::SetGangWeapons(int16 gang, int32 weapon1, int32 weapon2)
+{
+	CGangInfo *gi = GetGangInfo(gang);
+	gi->m_Weapon1 = weapon1;
+	gi->m_Weapon2 = weapon2;
+}
+
+void CGangs::SetGangPedModelOverride(int16 gang, int8 ovrd)
+{
+	GetGangInfo(gang)->m_nPedModelOverride = ovrd;
+}
+
+int8 CGangs::GetGangPedModelOverride(int16 gang)
+{
+	return GetGangInfo(gang)->m_nPedModelOverride;
+}
+
+void CGangs::SaveAllGangData(uint8 *buf, uint32 *size)
+{
+INITSAVEBUF
+
+	*size = SAVE_HEADER_SIZE + sizeof(Gang);
+	WriteSaveHeader(buf, 'G','N','G','\0', *size - SAVE_HEADER_SIZE);
+	for (int i = 0; i < NUM_GANGS; i++)
+		WriteSaveBuf(buf, Gang[i]);
+
+VALIDATESAVEBUF(*size);
+}
+
+void CGangs::LoadAllGangData(uint8 *buf, uint32 size)
+{
+	Initialise();
+
+INITSAVEBUF
+	CheckSaveHeader(buf, 'G','N','G','\0', size - SAVE_HEADER_SIZE);
+
+	for (int i = 0; i < NUM_GANGS; i++)
+		Gang[i] = ReadSaveBuf<CGangInfo>(buf);
+VALIDATESAVEBUF(size);
+}
+
+STARTPATCHES
+	InjectHook(0x4C3FB0, CGangs::Initialise, PATCH_JUMP);
+	InjectHook(0x4C4010, CGangs::SetGangVehicleModel, PATCH_JUMP);
+	InjectHook(0x4C4030, CGangs::SetGangWeapons, PATCH_JUMP);
+	InjectHook(0x4C4050, CGangs::SetGangPedModelOverride, PATCH_JUMP);
+	InjectHook(0x4C4070, CGangs::GetGangPedModelOverride, PATCH_JUMP);
+	InjectHook(0x4C4080, CGangs::SaveAllGangData, PATCH_JUMP);
+	InjectHook(0x4C4100, CGangs::LoadAllGangData, PATCH_JUMP);
+ENDPATCHES

src/peds/Gangs.h

@@ -0,0 +1,44 @@
+#pragma once
+
+struct CGangInfo
+{
+	int32 m_nVehicleMI;
+	int8 m_nPedModelOverride;
+	int32 m_Weapon1;
+	int32 m_Weapon2;
+
+	CGangInfo();
+};
+
+static_assert(sizeof(CGangInfo) == 0x10, "CGangInfo: error");
+
+enum {
+	GANG_MAFIA = 0,
+	GANG_TRIAD,
+	GANG_DIABLOS,
+	GANG_YAKUZA,
+	GANG_YARDIE,
+	GANG_COLUMB,
+	GANG_HOODS,
+	GANG_7,
+	GANG_8,
+	NUM_GANGS
+};
+
+class CGangs
+{
+public:
+	static void Initialise(void);
+	static void SetGangVehicleModel(int16, int32);
+	static void SetGangWeapons(int16, int32, int32);
+	static void SetGangPedModelOverride(int16, int8);
+	static int8 GetGangPedModelOverride(int16);
+	static void SaveAllGangData(uint8 *, uint32 *);
+	static void LoadAllGangData(uint8 *, uint32);
+
+	static int32 GetGangVehicleModel(int16 gang) { return Gang[gang].m_nVehicleMI; }
+	static CGangInfo *GetGangInfo(int16 gang) { return &Gang[gang]; }
+
+private:
+	static CGangInfo Gang[NUM_GANGS];
+};