diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-10-18 11:34:34 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-10-18 11:34:34 +0200 |
| commit | c856d88691be1f40b454ac499305503d51c2d792 (patch) | |
| tree | cae0070c66089b232eb3ab54005ef5d4278e1303 /src | |
| parent | finished save/load (diff) | |
| download | re3-c856d88691be1f40b454ac499305503d51c2d792.tar re3-c856d88691be1f40b454ac499305503d51c2d792.tar.gz re3-c856d88691be1f40b454ac499305503d51c2d792.tar.bz2 re3-c856d88691be1f40b454ac499305503d51c2d792.tar.lz re3-c856d88691be1f40b454ac499305503d51c2d792.tar.xz re3-c856d88691be1f40b454ac499305503d51c2d792.tar.zst re3-c856d88691be1f40b454ac499305503d51c2d792.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/Pools.cpp | 6 | ||||
| -rw-r--r-- | src/objects/Object.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp index 774f406d..b25fa4e1 100644 --- a/src/core/Pools.cpp +++ b/src/core/Pools.cpp @@ -378,7 +378,7 @@ INITSAVEBUF CopyToBuf(buf, bGlassBroken); CopyToBuf(buf, bHasBeenDamaged); CopyToBuf(buf, bUseVehicleColours); - CopyToBuf(buf, pObject->m_unk); + CopyToBuf(buf, pObject->m_nCostValue); CopyToBuf(buf, pObject->m_nBonusValue); SkipSaveBuf(buf, 1); CopyToBuf(buf, pObject->m_fCollisionDamageMultiplier); @@ -430,7 +430,7 @@ INITSAVEBUF pBufferObject->bHasBeenDamaged = bitFlag; CopyFromBuf(buf, bitFlag); pBufferObject->bUseVehicleColours = bitFlag; - CopyFromBuf(buf, pBufferObject->m_unk); + CopyFromBuf(buf, pBufferObject->m_nCostValue); CopyFromBuf(buf, pBufferObject->m_nBonusValue); SkipSaveBuf(buf, 1); CopyFromBuf(buf, pBufferObject->m_fCollisionDamageMultiplier); @@ -467,7 +467,7 @@ INITSAVEBUF (pObject->GetAddressOfEntityProperties())[1] = (pBufferObject->GetAddressOfEntityProperties())[1]; #endif pObject->bHasCollided = false; - pObject->m_unk = pBufferObject->m_unk; + pObject->m_nCostValue = pBufferObject->m_nCostValue; pObject->m_nBonusValue = pBufferObject->m_nBonusValue; CWorld::Add(pObject); delete[] obuf; diff --git a/src/objects/Object.h b/src/objects/Object.h index e255c20d..ce45509f 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -71,7 +71,7 @@ public: uint8 bIsWeapon : 1; uint8 bIsStreetLight : 1; int8 m_nBonusValue; - uint16 m_unk; // TODO(MIAMI) + uint16 m_nCostValue; float m_fCollisionDamageMultiplier; uint8 m_nCollisionDamageEffect; uint8 m_nSpecialCollisionResponseCases; |