summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index b7778e797..4310b1567 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -32,7 +32,12 @@
#define POSZ_TOINT FloorC(GetPosZ())
#define POS_TOINT GetPosition().Floor()
-#define GET_AND_VERIFY_CURRENT_CHUNK(ChunkVarName, X, Z) cChunk * ChunkVarName = a_Chunk.GetNeighborChunk(X, Z); if ((ChunkVarName == nullptr) || !ChunkVarName->IsValid()) { return; }
+#define GET_AND_VERIFY_CURRENT_CHUNK(ChunkVarName, X, Z) \
+ cChunk * ChunkVarName = a_Chunk.GetNeighborChunk(X, Z); \
+ if ((ChunkVarName == nullptr) || !ChunkVarName->IsValid()) \
+ { \
+ return; \
+ }
@@ -518,9 +523,6 @@ protected:
bool m_ShouldPreventTeleportation;
};
- static cCriticalSection m_CSCount;
- static UInt32 m_EntityCount;
-
/** Measured in meters / second (m / s) */
Vector3d m_Speed;