summaryrefslogtreecommitdiffstats
path: root/src/objects/Object.h
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-04-19 15:54:05 +0200
committerGitHub <noreply@github.com>2020-04-19 15:54:05 +0200
commitf9ed50e17813d2a6708a6516e18041c7482a7462 (patch)
treee8d1312d1e2a9706793ac781271fedc73db91624 /src/objects/Object.h
parentFix savename buffer overflow (diff)
parentStruct cleanup, various fixes, enable PS2 rand (diff)
downloadre3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.gz
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.bz2
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.lz
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.xz
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.zst
re3-f9ed50e17813d2a6708a6516e18041c7482a7462.zip
Diffstat (limited to 'src/objects/Object.h')
-rw-r--r--src/objects/Object.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/objects/Object.h b/src/objects/Object.h
index 081c285a..319ec4bc 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -47,13 +47,12 @@ public:
float m_fUprootLimit;
int8 ObjectCreatedBy;
int8 bIsPickup : 1;
- int8 m_obj_flag2 : 1;
+ int8 bPickupObjWithMessage : 1;
int8 bOutOfStock : 1;
int8 bGlassCracked : 1;
int8 bGlassBroken : 1;
int8 bHasBeenDamaged : 1;
int8 bUseVehicleColours : 1;
- int8 m_obj_flag80 : 1;
int8 m_nBonusValue;
float m_fCollisionDamageMultiplier;
uint8 m_nCollisionDamageEffect;