diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-10-17 19:45:07 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-10-17 19:45:07 +0200 |
| commit | 720abca8269dfeb725c58d016eb88f2c124170b9 (patch) | |
| tree | 8a8d7edf553c0f920ced15645a675225137cf7bd /src/core/Pools.cpp | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-720abca8269dfeb725c58d016eb88f2c124170b9.tar re3-720abca8269dfeb725c58d016eb88f2c124170b9.tar.gz re3-720abca8269dfeb725c58d016eb88f2c124170b9.tar.bz2 re3-720abca8269dfeb725c58d016eb88f2c124170b9.tar.lz re3-720abca8269dfeb725c58d016eb88f2c124170b9.tar.xz re3-720abca8269dfeb725c58d016eb88f2c124170b9.tar.zst re3-720abca8269dfeb725c58d016eb88f2c124170b9.zip | |
Diffstat (limited to 'src/core/Pools.cpp')
| -rw-r--r-- | src/core/Pools.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp index e0c45982..774f406d 100644 --- a/src/core/Pools.cpp +++ b/src/core/Pools.cpp @@ -345,8 +345,9 @@ INITSAVEBUF ++nObjects; } *size = nObjects * (sizeof(int16) + sizeof(int) + sizeof(CCompressedMatrix) + - sizeof(float) + sizeof(CCompressedMatrix) + sizeof(int8) + 7 * sizeof(bool) + sizeof(float) + - sizeof(int8) + sizeof(int8) + sizeof(uint32) + 2 * sizeof(uint32)) + sizeof(int); + sizeof(float) + sizeof(CCompressedMatrix) + sizeof(int8) + 7 * sizeof(bool) + sizeof(int16) + + + sizeof(int8) * 2 + sizeof(float) + sizeof(int8) + sizeof(int8) + + sizeof(uint32) + 2 * sizeof(uint32)) + sizeof(int); CopyToBuf(buf, nObjects); for (int i = 0; i < nPoolSize; i++) { CObject* pObject = GetObjectPool()->GetSlot(i); @@ -370,7 +371,6 @@ INITSAVEBUF tmp.CompressFromFullMatrix(pObject->m_objectMatrix); CopyToBuf(buf, tmp); CopyToBuf(buf, pObject->ObjectCreatedBy); - SkipSaveBuf(buf, 1); CopyToBuf(buf, bIsPickup); CopyToBuf(buf, bPickupObjWithMessage); CopyToBuf(buf, bOutOfStock); @@ -380,6 +380,7 @@ INITSAVEBUF CopyToBuf(buf, bUseVehicleColours); CopyToBuf(buf, pObject->m_unk); CopyToBuf(buf, pObject->m_nBonusValue); + SkipSaveBuf(buf, 1); CopyToBuf(buf, pObject->m_fCollisionDamageMultiplier); CopyToBuf(buf, pObject->m_nCollisionDamageEffect); CopyToBuf(buf, pObject->m_nSpecialCollisionResponseCases); |