diff options
| author | tycho <work.tycho@gmail.com> | 2015-09-25 16:49:22 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-12-18 19:14:34 +0100 |
| commit | 26caea80d35d4ff2ac3879d5ae6ab49f2f876385 (patch) | |
| tree | dbbeff77f1653217bab4f06ae3f2763bef0bd21b /src/Entities | |
| parent | Refactored some protocol logging (diff) | |
| download | cuberite-26caea80d35d4ff2ac3879d5ae6ab49f2f876385.tar cuberite-26caea80d35d4ff2ac3879d5ae6ab49f2f876385.tar.gz cuberite-26caea80d35d4ff2ac3879d5ae6ab49f2f876385.tar.bz2 cuberite-26caea80d35d4ff2ac3879d5ae6ab49f2f876385.tar.lz cuberite-26caea80d35d4ff2ac3879d5ae6ab49f2f876385.tar.xz cuberite-26caea80d35d4ff2ac3879d5ae6ab49f2f876385.tar.zst cuberite-26caea80d35d4ff2ac3879d5ae6ab49f2f876385.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Player.cpp | 4 | ||||
| -rw-r--r-- | src/Entities/Player.h | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 33ded6ab9..1c2432fc5 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -328,7 +328,7 @@ int cPlayer::XpForLevel(int a_Level) -int cPlayer::GetXpLevel() +int cPlayer::GetXpLevel() const { return CalcLevelFromXp(m_CurrentXp); } @@ -337,7 +337,7 @@ int cPlayer::GetXpLevel() -float cPlayer::GetXpPercentage() +float cPlayer::GetXpPercentage() const { int currentLevel = CalcLevelFromXp(m_CurrentXp); int currentLevel_XpBase = XpForLevel(currentLevel); diff --git a/src/Entities/Player.h b/src/Entities/Player.h index bff9599f7..d33e40445 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -81,16 +81,16 @@ public: int DeltaExperience(int a_Xp_delta); /** Gets the experience total - XpTotal for score on death */ - inline int GetXpLifetimeTotal(void) { return m_LifetimeTotalXp; } + inline int GetXpLifetimeTotal(void) const { return m_LifetimeTotalXp; } /** Gets the current experience */ - inline int GetCurrentXp(void) { return m_CurrentXp; } + inline int GetCurrentXp(void) const { return m_CurrentXp; } /** Gets the current level - XpLevel */ - int GetXpLevel(void); + int GetXpLevel(void) const; /** Gets the experience bar percentage - XpP */ - float GetXpPercentage(void); + float GetXpPercentage(void) const; /** Calculates the amount of XP needed for a given level Ref: http://minecraft.gamepedia.com/XP @@ -128,6 +128,7 @@ public: /** Gets the contents of the player's associated enderchest */ cItemGrid & GetEnderChestContents(void) { return m_EnderChestContents; } + const cItemGrid & GetEnderChestContents(void) const { return m_EnderChestContents; } inline const cItem & GetEquippedItem(void) const { return GetInventory().GetEquippedItem(); } // tolua_export |