summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-19 13:34:05 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-19 13:34:05 +0200
commitcc600de51f5946af5d4018b7681f2c11c68662e7 (patch)
tree73782543b31568c66bba5d1f87ea0ffcbdca2357 /src/Entities
parentUse std::thread (diff)
parentcLuaState: cMonster descendants don't push their specific type. (diff)
downloadcuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar.gz
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar.bz2
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar.lz
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar.xz
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar.zst
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.h10
-rw-r--r--src/Entities/Player.cpp12
2 files changed, 11 insertions, 11 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index f0577aba2..07754791d 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -172,13 +172,13 @@ public:
/// Returns true if the entity is of the specified class or a subclass (cPawn's IsA("cEntity") returns true)
virtual bool IsA(const char * a_ClassName) const;
- /// Returns the topmost class name for the object
- virtual const char * GetClass(void) const;
-
- // Returns the class name of this class
+ /** Returns the class name of this class */
static const char * GetClassStatic(void);
- /// Returns the topmost class's parent class name for the object. cEntity returns an empty string (no parent).
+ /** Returns the topmost class name for the object */
+ virtual const char * GetClass(void) const;
+
+ /** Returns the topmost class's parent class name for the object. cEntity returns an empty string (no parent). */
virtual const char * GetParentClass(void) const;
cWorld * GetWorld(void) const { return m_World; }
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index ecafe6341..6bd0a3d20 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -2134,19 +2134,19 @@ void cPlayer::ApplyFoodExhaustionFromMovement()
void cPlayer::LoadRank(void)
{
// Load the values from cRankManager:
- cRankManager & RankMgr = cRoot::Get()->GetRankManager();
- m_Rank = RankMgr.GetPlayerRankName(m_UUID);
+ cRankManager * RankMgr = cRoot::Get()->GetRankManager();
+ m_Rank = RankMgr->GetPlayerRankName(m_UUID);
if (m_Rank.empty())
{
- m_Rank = RankMgr.GetDefaultRank();
+ m_Rank = RankMgr->GetDefaultRank();
}
else
{
// Update the name:
- RankMgr.UpdatePlayerName(m_UUID, m_PlayerName);
+ RankMgr->UpdatePlayerName(m_UUID, m_PlayerName);
}
- m_Permissions = RankMgr.GetPlayerPermissions(m_UUID);
- RankMgr.GetRankVisuals(m_Rank, m_MsgPrefix, m_MsgSuffix, m_MsgNameColorCode);
+ m_Permissions = RankMgr->GetPlayerPermissions(m_UUID);
+ RankMgr->GetRankVisuals(m_Rank, m_MsgPrefix, m_MsgSuffix, m_MsgNameColorCode);
// Break up the individual permissions on each dot, into m_SplitPermissions:
m_SplitPermissions.clear();