summaryrefslogtreecommitdiffstats
path: root/src/objects/Object.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-03 21:28:56 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-03 21:37:13 +0200
commit72e12f6aae10e294c9265dd58c75db5c5c54bd24 (patch)
tree12444f855de79b35585a712d3137ed15d7b73096 /src/objects/Object.h
parentMerge pull request #219 from Sergeanur/MoneyMessages (diff)
downloadre3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar.gz
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar.bz2
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar.lz
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar.xz
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.tar.zst
re3-72e12f6aae10e294c9265dd58c75db5c5c54bd24.zip
Diffstat (limited to 'src/objects/Object.h')
-rw-r--r--src/objects/Object.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/objects/Object.h b/src/objects/Object.h
index 21348b52..47af4fbf 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -34,13 +34,13 @@ public:
int8 ObjectCreatedBy;
int8 bIsPickup : 1;
int8 m_obj_flag2 : 1;
- int8 m_obj_flag4 : 1;
+ int8 bOutOfStock : 1;
int8 m_obj_flag8 : 1;
int8 m_obj_flag10 : 1;
int8 bHasBeenDamaged : 1;
int8 bUseVehicleColours : 1;
int8 m_obj_flag80 : 1;
- int8 field_172;
+ int8 field_172; // car for a bonus pickup?
int8 field_173;
float m_fCollisionDamageMultiplier;
uint8 m_nCollisionDamageEffect;
@@ -63,7 +63,9 @@ public:
static int16 &nBodyCastHealth;
static void *operator new(size_t);
+ static void *operator new(size_t, int);
static void operator delete(void*, size_t);
+ static void operator delete(void*, int);
CObject(void);
CObject(int32, bool);