diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-18 10:31:53 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-18 10:31:53 +0200 |
| commit | 555f933780653012e7c2c664f91f88914a42e05e (patch) | |
| tree | 861011464aa08fead52ab03cf92b8e4dbd8a8f39 /src/objects | |
| parent | Merge pull request #465 from erorcun/erorcun (diff) | |
| download | re3-555f933780653012e7c2c664f91f88914a42e05e.tar re3-555f933780653012e7c2c664f91f88914a42e05e.tar.gz re3-555f933780653012e7c2c664f91f88914a42e05e.tar.bz2 re3-555f933780653012e7c2c664f91f88914a42e05e.tar.lz re3-555f933780653012e7c2c664f91f88914a42e05e.tar.xz re3-555f933780653012e7c2c664f91f88914a42e05e.tar.zst re3-555f933780653012e7c2c664f91f88914a42e05e.zip | |
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/Object.h | 6 | ||||
| -rw-r--r-- | src/objects/ParticleObject.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/objects/Object.h b/src/objects/Object.h index 0c00f441..081c285a 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -55,20 +55,20 @@ public: int8 bUseVehicleColours : 1; int8 m_obj_flag80 : 1; int8 m_nBonusValue; - int8 field_173; float m_fCollisionDamageMultiplier; uint8 m_nCollisionDamageEffect; uint8 m_nSpecialCollisionResponseCases; bool m_bCameraToAvoidThisObject; + + // this batch is unused int8 field_17B; int8 field_17C; int8 field_17D; int8 field_17E; int8 field_17F; + uint32 m_nEndOfLifeTime; int16 m_nRefModelIndex; - int8 field_186; - int8 field_187; CEntity *m_pCurSurface; CEntity *m_pCollidingEntity; int8 m_colour1, m_colour2; diff --git a/src/objects/ParticleObject.h b/src/objects/ParticleObject.h index cfa5936d..9e28d272 100644 --- a/src/objects/ParticleObject.h +++ b/src/objects/ParticleObject.h @@ -53,14 +53,12 @@ public: uint8 m_nSkipFrames; uint16 m_nFrameCounter; uint16 m_nState; - char _pad0[2]; CVector m_vecTarget; float m_fRandVal; float m_fSize; CRGBA m_Color; uint8 m_bRemove; int8 m_nCreationChance; - char _pad1[2]; static CParticleObject *pCloseListHead; static CParticleObject *pFarListHead; |