diff options
| author | archshift <admin@archshift.com> | 2014-08-03 07:42:53 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-08-11 00:06:59 +0200 |
| commit | dba672361164dc5dc5f94d24bde3176c7de89d4c (patch) | |
| tree | 6ce4fe45e2dda750c213c27b91b1b5c1f0ac67f1 /src/Entities | |
| parent | Merge pull request #1311 from mc-server/CMakeFix (diff) | |
| download | cuberite-dba672361164dc5dc5f94d24bde3176c7de89d4c.tar cuberite-dba672361164dc5dc5f94d24bde3176c7de89d4c.tar.gz cuberite-dba672361164dc5dc5f94d24bde3176c7de89d4c.tar.bz2 cuberite-dba672361164dc5dc5f94d24bde3176c7de89d4c.tar.lz cuberite-dba672361164dc5dc5f94d24bde3176c7de89d4c.tar.xz cuberite-dba672361164dc5dc5f94d24bde3176c7de89d4c.tar.zst cuberite-dba672361164dc5dc5f94d24bde3176c7de89d4c.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Player.cpp | 2 | ||||
| -rw-r--r-- | src/Entities/Player.h | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 608316e9a..91bcddca3 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -509,7 +509,7 @@ void cPlayer::Heal(int a_Health) void cPlayer::SetFoodLevel(int a_FoodLevel) { - int FoodLevel = std::max(0, std::min(a_FoodLevel, (int)MAX_FOOD_LEVEL)); + int FoodLevel = Clamp(a_FoodLevel, 0, MAX_FOOD_LEVEL); if (cRoot::Get()->GetPluginManager()->CallHookPlayerFoodLevelChange(*this, FoodLevel)) { diff --git a/src/Entities/Player.h b/src/Entities/Player.h index e26808bfc..f345a0207 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -29,12 +29,13 @@ class cPlayer : typedef cPawn super; public: - enum - { - MAX_HEALTH = 20, - MAX_FOOD_LEVEL = 20, - EATING_TICKS = 30, ///< Number of ticks it takes to eat an item - } ; + static const int MAX_HEALTH = 20; + + static const int MAX_FOOD_LEVEL = 20; + + /** Number of ticks it takes to eat an item */ + static const int EATING_TICKS = 30; + // tolua_end CLASS_PROTODEF(cPlayer) |