summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel O'Brien <marmot.daniel@gmail.com>2013-11-13 21:07:57 +0100
committerDaniel O'Brien <marmot.daniel@gmail.com>2013-11-13 21:07:57 +0100
commitb0be6cb02d674ae93ed06354b68f76a01b3c346d (patch)
tree5cfa4b2dfc430aa0d65eae1ff6e09106b18e9b57
parentminor changes (diff)
downloadcuberite-b0be6cb02d674ae93ed06354b68f76a01b3c346d.tar
cuberite-b0be6cb02d674ae93ed06354b68f76a01b3c346d.tar.gz
cuberite-b0be6cb02d674ae93ed06354b68f76a01b3c346d.tar.bz2
cuberite-b0be6cb02d674ae93ed06354b68f76a01b3c346d.tar.lz
cuberite-b0be6cb02d674ae93ed06354b68f76a01b3c346d.tar.xz
cuberite-b0be6cb02d674ae93ed06354b68f76a01b3c346d.tar.zst
cuberite-b0be6cb02d674ae93ed06354b68f76a01b3c346d.zip
-rw-r--r--source/Entities/Player.cpp2
-rw-r--r--source/Entities/Player.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp
index 88be5de56..f79fbfe7a 100644
--- a/source/Entities/Player.cpp
+++ b/source/Entities/Player.cpp
@@ -284,7 +284,7 @@ int cPlayer::CalcLevelFromXp(int a_XpTotal)
-int cPlayer::XpAtLevel(int a_Level)
+int cPlayer::XpForLevel(int a_Level)
{
//level 0 to 15
if(a_Level <= 15)
diff --git a/source/Entities/Player.h b/source/Entities/Player.h
index 3623617f2..e89bd3739 100644
--- a/source/Entities/Player.h
+++ b/source/Entities/Player.h
@@ -66,7 +66,7 @@ public:
/** Sets the experience total
Returns true on success
- should really only be called at init or player death
+ "should" really only be called at init or player death, plugins excepted
*/
bool SetExperience(int a_XpTotal);
@@ -410,8 +410,8 @@ protected:
/// Player Xp level
int m_XpTotal;
- /// Caculates the Xp at a given level, ref: http://minecraft.gamepedia.com/XP
- static int XpAtLevel(int a_Level);
+ /// Caculates the Xp needed for a given level, ref: http://minecraft.gamepedia.com/XP
+ static int XpForLevel(int a_Level);
/// inverse of XpAtLevel, ref: http://minecraft.gamepedia.com/XP values are as per this with pre-calculations
static int CalcLevelFromXp(int a_XpTotal);