mirrors
/
re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

object field renamed

This commit is contained in:
Nikolay Korolev 2020-10-18 12:34:34 +03:00
parent 720abca826
commit c856d88691
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/Pools.cpp
View File

@ -378,7 +378,7 @@ INITSAVEBUF
CopyToBuf(buf, bGlassBroken); CopyToBuf(buf, bGlassBroken);
CopyToBuf(buf, bHasBeenDamaged); CopyToBuf(buf, bHasBeenDamaged);
CopyToBuf(buf, bUseVehicleColours); CopyToBuf(buf, bUseVehicleColours);
CopyToBuf(buf, pObject->m_unk); CopyToBuf(buf, pObject->m_nCostValue);
CopyToBuf(buf, pObject->m_nBonusValue); CopyToBuf(buf, pObject->m_nBonusValue);
SkipSaveBuf(buf, 1); SkipSaveBuf(buf, 1);
CopyToBuf(buf, pObject->m_fCollisionDamageMultiplier); CopyToBuf(buf, pObject->m_fCollisionDamageMultiplier);
@ -430,7 +430,7 @@ INITSAVEBUF
pBufferObject->bHasBeenDamaged = bitFlag; pBufferObject->bHasBeenDamaged = bitFlag;
CopyFromBuf(buf, bitFlag); CopyFromBuf(buf, bitFlag);
pBufferObject->bUseVehicleColours = bitFlag; pBufferObject->bUseVehicleColours = bitFlag;
CopyFromBuf(buf, pBufferObject->m_unk); CopyFromBuf(buf, pBufferObject->m_nCostValue);
CopyFromBuf(buf, pBufferObject->m_nBonusValue); CopyFromBuf(buf, pBufferObject->m_nBonusValue);
SkipSaveBuf(buf, 1); SkipSaveBuf(buf, 1);
CopyFromBuf(buf, pBufferObject->m_fCollisionDamageMultiplier); CopyFromBuf(buf, pBufferObject->m_fCollisionDamageMultiplier);
@ -467,7 +467,7 @@ INITSAVEBUF
(pObject->GetAddressOfEntityProperties())[1] = (pBufferObject->GetAddressOfEntityProperties())[1]; (pObject->GetAddressOfEntityProperties())[1] = (pBufferObject->GetAddressOfEntityProperties())[1];
#endif #endif
pObject->bHasCollided = false; pObject->bHasCollided = false;
pObject->m_unk = pBufferObject->m_unk; pObject->m_nCostValue = pBufferObject->m_nCostValue;
pObject->m_nBonusValue = pBufferObject->m_nBonusValue; pObject->m_nBonusValue = pBufferObject->m_nBonusValue;
CWorld::Add(pObject); CWorld::Add(pObject);
delete[] obuf; delete[] obuf;

2
src/objects/Object.h
View File

@ -71,7 +71,7 @@ public:
uint8 bIsWeapon : 1; uint8 bIsWeapon : 1;
uint8 bIsStreetLight : 1; uint8 bIsStreetLight : 1;
int8 m_nBonusValue; int8 m_nBonusValue;
uint16 m_unk; // TODO(MIAMI) uint16 m_nCostValue;
float m_fCollisionDamageMultiplier; float m_fCollisionDamageMultiplier;
uint8 m_nCollisionDamageEffect; uint8 m_nCollisionDamageEffect;
uint8 m_nSpecialCollisionResponseCases; uint8 m_nSpecialCollisionResponseCases;