summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2020-04-18 12:08:38 +0200
committerFilip Gawin <filip.gawin@zoho.com>2020-04-18 12:08:38 +0200
commit2b1570de703c32ab43c979c286413a3a1c5e3dc0 (patch)
treeff5510329a08fd5b3dca88de1c9fc5e36abef1b9 /src/objects
parentPart one (diff)
parentZones save/load (diff)
downloadre3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.gz
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.bz2
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.lz
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.xz
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.zst
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.zip
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/Object.h6
-rw-r--r--src/objects/ParticleObject.h2
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 fc74bef0..7e4aebb7 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;