summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-31 16:53:17 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-31 16:53:17 +0100
commit18fb814c3487231410b96cf237d4cc488e964f87 (patch)
tree7f846df7669175e4a5d5276c81ad3c16f96f29c4 /src/Entities
parentrefactored chunk Queue to seperate class (diff)
parentremoved unneccisary cast (diff)
downloadcuberite-18fb814c3487231410b96cf237d4cc488e964f87.tar
cuberite-18fb814c3487231410b96cf237d4cc488e964f87.tar.gz
cuberite-18fb814c3487231410b96cf237d4cc488e964f87.tar.bz2
cuberite-18fb814c3487231410b96cf237d4cc488e964f87.tar.lz
cuberite-18fb814c3487231410b96cf237d4cc488e964f87.tar.xz
cuberite-18fb814c3487231410b96cf237d4cc488e964f87.tar.zst
cuberite-18fb814c3487231410b96cf237d4cc488e964f87.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.h6
-rw-r--r--src/Entities/Player.cpp4
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 3634f087c..2ba1b303d 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -424,11 +424,13 @@ protected:
void Dereference( cEntity*& a_EntityPtr );
private:
- // Measured in degrees (MAX 360 degrees)
+ // Measured in degrees, [-180, +180)
double m_HeadYaw;
+
// Measured in meter/second (m/s)
Vector3d m_Speed;
- // Measured in degrees (MAX 360 degrees)
+
+ // Measured in degrees, [-180, +180)
Vector3d m_Rot;
/// Position of the entity's XZ center and Y bottom
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 67d5a47ef..bc92790aa 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -908,8 +908,8 @@ bool cPlayer::IsGameModeSurvival(void) const
bool cPlayer::IsGameModeAdventure(void) const
{
- return (m_GameMode == gmCreative) || // Either the player is explicitly in Adventure
- ((m_GameMode == gmNotSet) && m_World->IsGameModeCreative()); // or they inherit from the world and the world is Adventure
+ return (m_GameMode == gmAdventure) || // Either the player is explicitly in Adventure
+ ((m_GameMode == gmNotSet) && m_World->IsGameModeAdventure()); // or they inherit from the world and the world is Adventure
}