diff options
author | aap <aap@papnet.eu> | 2019-06-28 09:49:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-28 09:49:47 +0200 |
commit | 6f4e01f078f66572e649e0c93ddd8dac6fc31760 (patch) | |
tree | 8e56841c926ffbcb5221ab19b92a89e4a20c5f5e | |
parent | Merge pull request #62 from erorcun/erorcun (diff) | |
parent | Changed save/load in CGang (diff) | |
download | re3-6f4e01f078f66572e649e0c93ddd8dac6fc31760.tar re3-6f4e01f078f66572e649e0c93ddd8dac6fc31760.tar.gz re3-6f4e01f078f66572e649e0c93ddd8dac6fc31760.tar.bz2 re3-6f4e01f078f66572e649e0c93ddd8dac6fc31760.tar.lz re3-6f4e01f078f66572e649e0c93ddd8dac6fc31760.tar.xz re3-6f4e01f078f66572e649e0c93ddd8dac6fc31760.tar.zst re3-6f4e01f078f66572e649e0c93ddd8dac6fc31760.zip |
-rw-r--r-- | src/control/Gangs.cpp | 91 | ||||
-rw-r--r-- | src/control/Gangs.h | 53 |
2 files changed, 144 insertions, 0 deletions
diff --git a/src/control/Gangs.cpp b/src/control/Gangs.cpp new file mode 100644 index 00000000..80ecd816 --- /dev/null +++ b/src/control/Gangs.cpp @@ -0,0 +1,91 @@ +#include "common.h" +#include "patcher.h" +#include "Gangs.h" + +CGangInfo(&CGangs::Gang)[NUM_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) +{ + buffer[0] = 'G'; + buffer[1] = 'N'; + buffer[2] = 'G'; + buffer[3] = '\0'; + *size = 8 + NUM_GANGS * 16; + *(uint32*)(buffer + 4) = *size - 8; + buffer += 8; + for (int i = 0; i < NUM_GANGS; i++) { + *(uint32*)(buffer) = GetGangInfo(i)->m_nVehicleMI; + *(int8*)(buffer + 4) = GetGangInfo(i)->m_nPedModelOverride; + *(int8*)(buffer + 5) = GetGangInfo(i)->field_5; + *(int16*)(buffer + 6) = GetGangInfo(i)->field_6; + *(eWeaponType*)(buffer + 8) = GetGangInfo(i)->m_Weapon1; + *(eWeaponType*)(buffer + 12) = GetGangInfo(i)->m_Weapon2; + buffer += 16; + } +} + +void CGangs::LoadAllGangData(uint8 *buffer, uint32 size) +{ + Initialize(); + assert(size == 8 + NUM_GANGS * 16); + assert(buffer[0] == 'G'); + assert(buffer[1] == 'N'); + assert(buffer[2] == 'G'); + assert(buffer[3] == '\0'); + assert(*(uint32*)(buffer + 4) == size - 8); + buffer += 8; + for (int i = 0; i < NUM_GANGS; i++){ + GetGangInfo(i)->m_nVehicleMI = *(uint32*)(buffer); + GetGangInfo(i)->m_nPedModelOverride = *(int8*)(buffer + 4); + GetGangInfo(i)->field_5 = *(int8*)(buffer + 5); + GetGangInfo(i)->field_6 = *(int16*)(buffer + 6); + GetGangInfo(i)->m_Weapon1 = *(eWeaponType*)(buffer + 8); + GetGangInfo(i)->m_Weapon2 = *(eWeaponType*)(buffer + 12); + buffer += 16; + } +} + +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..db14ca64 --- /dev/null +++ b/src/control/Gangs.h @@ -0,0 +1,53 @@ +#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, + NUM_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)[NUM_GANGS]; +}; |