summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-06 18:26:04 +0200
committerGitHub <noreply@github.com>2020-04-06 18:26:04 +0200
commitb991fd9766c77354454c76c906f7806680605500 (patch)
treef7425645eb83088646a72b713cd08a665947650e /src/objects
parentImplement Init for Stats (diff)
parentfixed look behind bug (diff)
downloadre3-b991fd9766c77354454c76c906f7806680605500.tar
re3-b991fd9766c77354454c76c906f7806680605500.tar.gz
re3-b991fd9766c77354454c76c906f7806680605500.tar.bz2
re3-b991fd9766c77354454c76c906f7806680605500.tar.lz
re3-b991fd9766c77354454c76c906f7806680605500.tar.xz
re3-b991fd9766c77354454c76c906f7806680605500.tar.zst
re3-b991fd9766c77354454c76c906f7806680605500.zip
Diffstat (limited to '')
-rw-r--r--src/objects/DummyObject.cpp2
-rw-r--r--src/objects/Object.cpp7
-rw-r--r--src/objects/Object.h6
-rw-r--r--src/objects/Projectile.cpp2
4 files changed, 12 insertions, 5 deletions
diff --git a/src/objects/DummyObject.cpp b/src/objects/DummyObject.cpp
index 9649cf7a..ba09ac3e 100644
--- a/src/objects/DummyObject.cpp
+++ b/src/objects/DummyObject.cpp
@@ -12,6 +12,8 @@ CDummyObject::CDummyObject(CObject *obj)
m_level = obj->m_level;
}
+#include <new>
+
class CDummyObject_ : public CDummyObject
{
public:
diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp
index 357d67d7..aa366aa0 100644
--- a/src/objects/Object.cpp
+++ b/src/objects/Object.cpp
@@ -5,6 +5,7 @@
#include "Pools.h"
#include "Radar.h"
#include "Object.h"
+#include "DummyObject.h"
WRAPPER void CObject::ObjectDamage(float amount) { EAXJMP(0x4BB240); }
WRAPPER void CObject::DeleteAllTempObjectInArea(CVector, float) { EAXJMP(0x4BBED0); }
@@ -37,8 +38,8 @@ CObject::CObject(void)
bIsPickup = false;
m_obj_flag2 = false;
bOutOfStock = false;
- m_obj_flag8 = false;
- m_obj_flag10 = false;
+ bGlassCracked = false;
+ bGlassBroken = false;
bHasBeenDamaged = false;
m_nRefModelIndex = -1;
bUseVehicleColours = false;
@@ -141,6 +142,8 @@ CObject::CanBeDeleted(void)
}
}
+#include <new>
+
class CObject_ : public CObject
{
public:
diff --git a/src/objects/Object.h b/src/objects/Object.h
index b9c570f5..27346e23 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -1,7 +1,6 @@
#pragma once
#include "Physical.h"
-#include "DummyObject.h"
enum {
GAME_OBJECT = 1,
@@ -26,6 +25,7 @@ enum {
};
class CVehicle;
+class CDummyObject;
class CObject : public CPhysical
{
@@ -36,8 +36,8 @@ public:
int8 bIsPickup : 1;
int8 m_obj_flag2 : 1;
int8 bOutOfStock : 1;
- int8 m_obj_flag8 : 1;
- int8 m_obj_flag10 : 1;
+ int8 bGlassCracked : 1;
+ int8 bGlassBroken : 1;
int8 bHasBeenDamaged : 1;
int8 bUseVehicleColours : 1;
int8 m_obj_flag80 : 1;
diff --git a/src/objects/Projectile.cpp b/src/objects/Projectile.cpp
index 0f6542e7..32bc6bdb 100644
--- a/src/objects/Projectile.cpp
+++ b/src/objects/Projectile.cpp
@@ -14,6 +14,8 @@ CProjectile::CProjectile(int32 model) : CObject()
ObjectCreatedBy = MISSION_OBJECT;
}
+#include <new>
+
class CProjectile_ : public CProjectile
{
public: