Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More save/load alignment fixes

Browse Source
This commit is contained in:
Sergeanur
2020-05-13 16:24:00 +03:00
parent 509d57edcb
commit 3f1001b86b
3 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/peds/Ped.cpp
View File

@@ -17738,23 +17738,25 @@ CPed::SetExitBoat(CVehicle *boat)
}
#ifdef COMPATIBLE_SAVES
#define CopyFromBuf(buf, data) memcpy(&data, buf, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
#define CopyToBuf(buf, data) memcpy(buf, &data, sizeof(data)); SkipSaveBuf(buf, sizeof(data));
void
CPed::Save(uint8*& buf)
{
SkipSaveBuf(buf, 52);
WriteSaveBuf<float>(buf, GetPosition().x);
WriteSaveBuf<float>(buf, GetPosition().y);
WriteSaveBuf<float>(buf, GetPosition().z);
CopyToBuf(buf, GetPosition().x);
CopyToBuf(buf, GetPosition().y);
CopyToBuf(buf, GetPosition().z);
SkipSaveBuf(buf, 288);
WriteSaveBuf<uint8>(buf, CharCreatedBy);
CopyToBuf(buf, CharCreatedBy);
SkipSaveBuf(buf, 351);
WriteSaveBuf<float>(buf, m_fHealth);
WriteSaveBuf<float>(buf, m_fArmour);
CopyToBuf(buf, m_fHealth);
CopyToBuf(buf, m_fArmour);
SkipSaveBuf(buf, 148);
for (int i = 0; i < 13; i++) // has to be hardcoded
m_weapons[i].Save(buf);
SkipSaveBuf(buf, 5);
WriteSaveBuf<uint8>(buf, m_maxWeaponTypeAllowed);
CopyToBuf(buf, m_maxWeaponTypeAllowed);
SkipSaveBuf(buf, 162);
}
@@ -17762,19 +17764,21 @@ void
CPed::Load(uint8*& buf)
{
SkipSaveBuf(buf, 52);
GetMatrix().GetPosition().x = ReadSaveBuf<float>(buf);
GetMatrix().GetPosition().y = ReadSaveBuf<float>(buf);
GetMatrix().GetPosition().z = ReadSaveBuf<float>(buf);
CopyFromBuf(buf, GetMatrix().GetPosition().x);
CopyFromBuf(buf, GetMatrix().GetPosition().y);
CopyFromBuf(buf, GetMatrix().GetPosition().z);
SkipSaveBuf(buf, 288);
CharCreatedBy = ReadSaveBuf<uint8>(buf);
CopyFromBuf(buf, CharCreatedBy);
SkipSaveBuf(buf, 351);
m_fHealth = ReadSaveBuf<float>(buf);
m_fArmour = ReadSaveBuf<float>(buf);
CopyFromBuf(buf, m_fHealth);
CopyFromBuf(buf, m_fArmour);
SkipSaveBuf(buf, 148);
for (int i = 0; i < 13; i++) // has to be hardcoded
m_weapons[i].Load(buf);
SkipSaveBuf(buf, 5);
m_maxWeaponTypeAllowed = ReadSaveBuf<uint8>(buf);
CopyFromBuf(buf, m_maxWeaponTypeAllowed);
SkipSaveBuf(buf, 162);
}
#undef CopyFromBuf
#undef CopyToBuf
#endif