summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel O'Brien <marmot.daniel@gmail.com>2013-11-13 18:41:36 +0100
committerDaniel O'Brien <marmot.daniel@gmail.com>2013-11-13 18:41:36 +0100
commitc17f77cf2a6394c833bcc7e83f65e7281f2f32b5 (patch)
tree4c7c36c12c5b5bb7fc0f3cc7a5587ee91fbf9b57
parentFixed problems with code style etc (diff)
downloadcuberite-c17f77cf2a6394c833bcc7e83f65e7281f2f32b5.tar
cuberite-c17f77cf2a6394c833bcc7e83f65e7281f2f32b5.tar.gz
cuberite-c17f77cf2a6394c833bcc7e83f65e7281f2f32b5.tar.bz2
cuberite-c17f77cf2a6394c833bcc7e83f65e7281f2f32b5.tar.lz
cuberite-c17f77cf2a6394c833bcc7e83f65e7281f2f32b5.tar.xz
cuberite-c17f77cf2a6394c833bcc7e83f65e7281f2f32b5.tar.zst
cuberite-c17f77cf2a6394c833bcc7e83f65e7281f2f32b5.zip
-rw-r--r--source/Entities/Player.cpp4
-rw-r--r--source/Entities/Player.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp
index 02d80a8b9..470ed428f 100644
--- a/source/Entities/Player.cpp
+++ b/source/Entities/Player.cpp
@@ -306,7 +306,7 @@ int cPlayer::XpAtLevel(int a_Level)
-int cPlayer::GetExperienceLevel()
+int cPlayer::XpGetLevel()
{
return CalcLevelFromXp(m_XpTotal);
}
@@ -315,7 +315,7 @@ int cPlayer::GetExperienceLevel()
-float cPlayer::GetExperiencePercentage()
+float cPlayer::XpGetPercentage()
{
int currentLevel = CalcLevelFromXp(m_XpTotal);
diff --git a/source/Entities/Player.h b/source/Entities/Player.h
index e0ccaf318..d998c47bb 100644
--- a/source/Entities/Player.h
+++ b/source/Entities/Player.h
@@ -76,13 +76,13 @@ public:
int AddExperience(int a_Xp_delta);
/// Gets the experience total - XpTotal
- inline int GetExperienceTotal(void) { return m_XpTotal; }
+ inline int XpGetTotal(void) { return m_XpTotal; }
/// Gets the current level - XpLevel
- int GetExperienceLevel(void);
+ int XpGetLevel(void);
/// Gets the experience bar percentage - XpP
- float GetExperiencePercentage(void);
+ float XpGetPercentage(void);
/// Starts charging the equipped bow
void StartChargingBow(void);