summaryrefslogtreecommitdiffstats
path: root/src/objects
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
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')
-rw-r--r--src/objects/Object.cpp4
-rw-r--r--src/objects/Object.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index bba4d7d9..9d531c9c 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -14,7 +14,9 @@ int16 &CObject::nNoTempObjects = *(int16*)0x95CCA2;
int16 &CObject::nBodyCastHealth = *(int16*)0x5F7D4C; // 1000
void *CObject::operator new(size_t sz) { return CPools::GetObjectPool()->New(); }
+void *CObject::operator new(size_t sz, int handle) { return CPools::GetObjectPool()->New(handle);};
void CObject::operator delete(void *p, size_t sz) { CPools::GetObjectPool()->Delete((CObject*)p); }
+void CObject::operator delete(void *p, int handle) { CPools::GetObjectPool()->Delete((CObject*)p); }
CObject::CObject(void)
{
@@ -32,7 +34,7 @@ CObject::CObject(void)
field_172 = 0;
bIsPickup = false;
m_obj_flag2 = false;
- m_obj_flag4 = false;
+ bOutOfStock = false;
m_obj_flag8 = false;
m_obj_flag10 = false;
bHasBeenDamaged = false;
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);