From 0d45f2fc23b5479f575022739b6d6a7457e8a53c Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Thu, 27 Jun 2019 01:30:59 +0300 Subject: [PATCH] Added Gangs --- src/control/Gangs.cpp | 71 +++++++++++++++++++++++++++++++++++++++++++ src/control/Gangs.h | 62 +++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 src/control/Gangs.cpp create mode 100644 src/control/Gangs.h diff --git a/src/control/Gangs.cpp b/src/control/Gangs.cpp new file mode 100644 index 00000000..2cb8a8a1 --- /dev/null +++ b/src/control/Gangs.cpp @@ -0,0 +1,71 @@ +#include "common.h" +#include "patcher.h" +#include "Gangs.h" + +CGangInfo(&CGangs::Gang)[TOTAL_GANGS] = *(CGangInfo(*)[9])*(uintptr*)0x6EDF78; + +void CGangs::Initialize(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; +} + +void CGangs::SetGangVehicleModel(int16 gang, int model) +{ + GetGangInfo(gang)->m_nVehicleMI = model; +} + +void CGangs::SetGangWeapons(int16 gang, eWeaponType weapon1, eWeaponType 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 *buffer, uint32 *size) +{ + tGangSaveData *data = (tGangSaveData*)buffer; + data->tag[0] = 'G'; + data->tag[1] = 'N'; + data->tag[2] = 'G'; + data->tag[3] = '\0'; + data->size = *size = sizeof(tGangSaveData); + for (int i = 0; i < TOTAL_GANGS; i++) + data->gangs[i] = *GetGangInfo(i); + buffer += sizeof(tGangSaveData); +} + +void CGangs::LoadAllGangData(uint8 *buffer, uint32 size) +{ + Initialize(); + tGangSaveData* data = (tGangSaveData*)buffer; + for (int i = 0; i < TOTAL_GANGS; i++) + *GetGangInfo(i) = data->gangs[i]; +} + +STARTPATCHES +InjectHook(0x4C3FB0, CGangs::Initialize, 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 diff --git a/src/control/Gangs.h b/src/control/Gangs.h new file mode 100644 index 00000000..1d735cfe --- /dev/null +++ b/src/control/Gangs.h @@ -0,0 +1,62 @@ +#pragma once + +#include "common.h" +#include "Weapon.h" +#include "ModelIndices.h" + +struct CGangInfo +{ + int32 m_nVehicleMI; + int8 m_nPedModelOverride; + int8 field_5; + int16 field_6; + eWeaponType m_Weapon1; + eWeaponType m_Weapon2; + + CGangInfo() : + m_nVehicleMI(MI_BUS), + m_nPedModelOverride(-1), + m_Weapon1(WEAPONTYPE_UNARMED), + m_Weapon2(WEAPONTYPE_UNARMED) + {} +}; + +static_assert(sizeof(CGangInfo) == 0x10, "CGangInfo: error"); + +class CGangs +{ +public: + enum { + GANG_MAFIA = 0, + GANG_TRIAD, + GANG_DIABLOS, + GANG_YAKUZA, + GANG_YARDIE, + GANG_COLUMB, + GANG_HOODS, + GANG_7, + GANG_8, + TOTAL_GANGS + }; + static void Initialize(void); + static void SetGangVehicleModel(int16, int); + static void SetGangWeapons(int16, eWeaponType, eWeaponType); + static void SetGangPedModelOverride(int16, int8); + static int8 GetGangPedModelOverride(int16); + static void SaveAllGangData(uint8 *, uint32 *); + static void LoadAllGangData(uint8 *, uint32); + +private: + static CGangInfo* GetGangInfo(int16 gang) { return &Gang[gang]; } + + static CGangInfo(&Gang)[TOTAL_GANGS]; +}; + +struct tGangSaveData +{ + char tag[4]; + int32 size; + CGangInfo gangs[CGangs::TOTAL_GANGS]; +}; + +static_assert(sizeof(tGangSaveData) == 0x98, "tGangSaveData: error"); \ No newline at end of file