summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-22 23:55:29 +0200
committerGitHub <noreply@github.com>2020-05-22 23:55:29 +0200
commit8fb72afac96434153d948d91685f7291e9b946d9 (patch)
tree25d4899924a591e4dafd44caf488dd9bf62db95e /src/entities
parentMerge pull request #579 from Xinerki/miami (diff)
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
downloadre3-8fb72afac96434153d948d91685f7291e9b946d9.tar
re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.gz
re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.bz2
re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.lz
re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.xz
re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.zst
re3-8fb72afac96434153d948d91685f7291e9b946d9.zip
Diffstat (limited to '')
-rw-r--r--src/entities/Physical.cpp3
-rw-r--r--src/entities/Physical.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index 92542071..6275e2b3 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -64,6 +64,9 @@ CPhysical::CPhysical(void)
m_phy_flagA20 = false;
m_nZoneLevel = LEVEL_NONE;
+
+ bIsFrozen = false;
+ bDontLoadCollision = false;
}
CPhysical::~CPhysical(void)
diff --git a/src/entities/Physical.h b/src/entities/Physical.h
index b6e28275..a1c60b6b 100644
--- a/src/entities/Physical.h
+++ b/src/entities/Physical.h
@@ -60,6 +60,9 @@ public:
uint8 bHitByTrain : 1;
uint8 bSkipLineCol : 1;
+ uint8 bIsFrozen : 1;
+ uint8 bDontLoadCollision : 1;
+
uint8 m_nSurfaceTouched;
int8 m_nZoneLevel;