summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-08-11 02:13:14 +0200
committerarchshift <admin@archshift.com>2014-08-11 02:13:14 +0200
commita7eb4032ee32f8299857ccdfc4ad9f45227abb05 (patch)
tree0ec1f380753b062ed17af28b2e5911975869d7f1
parentGave names to unnamed enums (diff)
downloadcuberite-a7eb4032ee32f8299857ccdfc4ad9f45227abb05.tar
cuberite-a7eb4032ee32f8299857ccdfc4ad9f45227abb05.tar.gz
cuberite-a7eb4032ee32f8299857ccdfc4ad9f45227abb05.tar.bz2
cuberite-a7eb4032ee32f8299857ccdfc4ad9f45227abb05.tar.lz
cuberite-a7eb4032ee32f8299857ccdfc4ad9f45227abb05.tar.xz
cuberite-a7eb4032ee32f8299857ccdfc4ad9f45227abb05.tar.zst
cuberite-a7eb4032ee32f8299857ccdfc4ad9f45227abb05.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Player.cpp9
-rw-r--r--src/Entities/Player.h6
2 files changed, 12 insertions, 3 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 91bcddca3..4398a5bf3 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -33,6 +33,15 @@
+const int cPlayer::MAX_HEALTH = 20;
+
+const int cPlayer::MAX_FOOD_LEVEL = 20;
+
+/** Number of ticks it takes to eat an item */
+const int cPlayer::EATING_TICKS = 30;
+
+
+
cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName) :
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index f345a0207..d3ed1ef9d 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -29,12 +29,12 @@ class cPlayer :
typedef cPawn super;
public:
- static const int MAX_HEALTH = 20;
+ static const int MAX_HEALTH;
- static const int MAX_FOOD_LEVEL = 20;
+ static const int MAX_FOOD_LEVEL;
/** Number of ticks it takes to eat an item */
- static const int EATING_TICKS = 30;
+ static const int EATING_TICKS;
// tolua_end