diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-21 14:32:40 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-21 14:32:40 +0100 |
| commit | 779aca60511055832e776ab4a6299a2b7e049a16 (patch) | |
| tree | dfb031e9bd01b25ab0199286cf6e660f26489817 /src/Entities/Entity.cpp | |
| parent | Merge branch 'master' into cmake (diff) | |
| parent | Merge branch 'master', remote-tracking branch 'upstream/master' (diff) | |
| download | cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.gz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.bz2 cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.lz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.xz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.zst cuberite-779aca60511055832e776ab4a6299a2b7e049a16.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 32ee7f2bd..8fcdcc82f 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -33,31 +33,31 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d , m_Attachee(NULL) , m_Referencers(new cReferenceManager(cReferenceManager::RFMNGR_REFERENCERS)) , m_References(new cReferenceManager(cReferenceManager::RFMNGR_REFERENCES)) - , m_HeadYaw( 0.0 ) - , m_Rot(0.0, 0.0, 0.0) - , m_Pos(a_X, a_Y, a_Z) - , m_Mass (0.001) //Default 1g , m_bDirtyHead(true) , m_bDirtyOrientation(true) , m_bDirtyPosition(true) , m_bDirtySpeed(true) , m_bOnGround( false ) , m_Gravity( -9.81f ) - , m_IsInitialized(false) , m_LastPosX( 0.0 ) , m_LastPosY( 0.0 ) , m_LastPosZ( 0.0 ) , m_TimeLastTeleportPacket(0) , m_TimeLastMoveReltPacket(0) , m_TimeLastSpeedPacket(0) + , m_IsInitialized(false) , m_EntityType(a_EntityType) , m_World(NULL) , m_TicksSinceLastBurnDamage(0) , m_TicksSinceLastLavaDamage(0) , m_TicksSinceLastFireDamage(0) - , m_TicksSinceLastVoidDamage(0) , m_TicksLeftBurning(0) + , m_TicksSinceLastVoidDamage(0) + , m_HeadYaw( 0.0 ) + , m_Rot(0.0, 0.0, 0.0) + , m_Pos(a_X, a_Y, a_Z) , m_WaterSpeed(0, 0, 0) + , m_Mass (0.001) // Default 1g , m_Width(a_Width) , m_Height(a_Height) { |