summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.h
diff options
context:
space:
mode:
authorDevToaster <blazetoaster@gmail.com>2015-02-28 17:33:41 +0100
committerDevToaster <blazetoaster@gmail.com>2015-02-28 17:33:41 +0100
commitb65a6ef210a590c6d265cdd71efe58b81a4ae836 (patch)
treee0fa0ca9b0985b494f18005fae329b15292f6e4a /src/Entities/Player.h
parentMerge pull request #1778 from mc-server/OreXP (diff)
downloadcuberite-b65a6ef210a590c6d265cdd71efe58b81a4ae836.tar
cuberite-b65a6ef210a590c6d265cdd71efe58b81a4ae836.tar.gz
cuberite-b65a6ef210a590c6d265cdd71efe58b81a4ae836.tar.bz2
cuberite-b65a6ef210a590c6d265cdd71efe58b81a4ae836.tar.lz
cuberite-b65a6ef210a590c6d265cdd71efe58b81a4ae836.tar.xz
cuberite-b65a6ef210a590c6d265cdd71efe58b81a4ae836.tar.zst
cuberite-b65a6ef210a590c6d265cdd71efe58b81a4ae836.zip
Diffstat (limited to 'src/Entities/Player.h')
-rw-r--r--src/Entities/Player.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 7abb1b98a..021b6fb0a 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -72,22 +72,22 @@ public:
Returns true on success
"should" really only be called at init or player death, plugins excepted
*/
- bool SetCurrentExperience(short a_XpTotal);
+ bool SetCurrentExperience(int a_XpTotal);
/* changes Xp by Xp_delta, you "shouldn't" inc more than MAX_EXPERIENCE_ORB_SIZE
Wont't allow xp to go negative
Returns the new current experience, -1 on error
*/
- short DeltaExperience(short a_Xp_delta);
+ int DeltaExperience(int a_Xp_delta);
/** Gets the experience total - XpTotal for score on death */
- inline short GetXpLifetimeTotal(void) { return m_LifetimeTotalXp; }
+ inline int GetXpLifetimeTotal(void) { return m_LifetimeTotalXp; }
/** Gets the currrent experience */
- inline short GetCurrentXp(void) { return m_CurrentXp; }
+ inline int GetCurrentXp(void) { return m_CurrentXp; }
/** Gets the current level - XpLevel */
- short GetXpLevel(void);
+ int GetXpLevel(void);
/** Gets the experience bar percentage - XpP */
float GetXpPercentage(void);
@@ -95,13 +95,13 @@ public:
/** Caculates the amount of XP needed for a given level
Ref: http://minecraft.gamepedia.com/XP
*/
- static short XpForLevel(short int a_Level);
+ static int XpForLevel(int a_Level);
/** Inverse of XpForLevel
Ref: http://minecraft.gamepedia.com/XP
values are as per this with pre-calculations
*/
- static short CalcLevelFromXp(short int a_CurrentXp);
+ static int CalcLevelFromXp(int a_CurrentXp);
// tolua_end
@@ -581,8 +581,8 @@ protected:
Int64 m_EatingFinishTick;
/** Player Xp level */
- short int m_LifetimeTotalXp;
- short int m_CurrentXp;
+ int m_LifetimeTotalXp;
+ int m_CurrentXp;
// flag saying we need to send a xp update to client
bool m_bDirtyExperience;
@@ -609,7 +609,7 @@ protected:
*/
bool m_bIsTeleporting;
- /** The short UUID (no dashes) of the player, as read from the ClientHandle.
+ /** The int UUID (no dashes) of the player, as read from the ClientHandle.
If no ClientHandle is given, the UUID is initialized to empty. */
AString m_UUID;