diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-27 23:45:06 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-27 23:45:06 +0300 |
| commit | 1c7fee4b9fc1684f83b62705573a34218b3159d3 (patch) | |
| tree | b39c31b36fd8a81bb6abf2c2089d2be5fefad86e /src/control/Gangs.cpp | |
| parent | 969d4ac48d20f641a90e0b61105ec65766c52c3d (diff) | |
Changed save/load in CGang
Diffstat (limited to 'src/control/Gangs.cpp')
| -rw-r--r-- | src/control/Gangs.cpp | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/src/control/Gangs.cpp b/src/control/Gangs.cpp index 2cb8a8a1..80ecd816 100644 --- a/src/control/Gangs.cpp +++ b/src/control/Gangs.cpp @@ -2,7 +2,7 @@ #include "patcher.h" #include "Gangs.h" -CGangInfo(&CGangs::Gang)[TOTAL_GANGS] = *(CGangInfo(*)[9])*(uintptr*)0x6EDF78; +CGangInfo(&CGangs::Gang)[NUM_GANGS] = *(CGangInfo(*)[9])*(uintptr*)0x6EDF78; void CGangs::Initialize(void) { @@ -41,23 +41,43 @@ int8 CGangs::GetGangPedModelOverride(int16 gang) 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); + 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(); - tGangSaveData* data = (tGangSaveData*)buffer; - for (int i = 0; i < TOTAL_GANGS; i++) - *GetGangInfo(i) = data->gangs[i]; + 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 |