flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Player.cpp: change unnamed enum to constant integers

Browse Source
This commit is contained in:
archshift 2014-08-02 22:42:53 -07:00
parent 0953bf403b
commit dba6723611
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/Player.cpp
View File

@ -509,7 +509,7 @@ void cPlayer::Heal(int a_Health)
void cPlayer::SetFoodLevel(int a_FoodLevel) 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)) if (cRoot::Get()->GetPluginManager()->CallHookPlayerFoodLevelChange(*this, FoodLevel))
{ {

13
src/Entities/Player.h
View File

@ -29,12 +29,13 @@ class cPlayer :
typedef cPawn super; typedef cPawn super;
public: public:
enum static const int MAX_HEALTH = 20;
{
MAX_HEALTH = 20, static const int MAX_FOOD_LEVEL = 20;
MAX_FOOD_LEVEL = 20,
EATING_TICKS = 30, ///< Number of ticks it takes to eat an item /** Number of ticks it takes to eat an item */
} ; static const int EATING_TICKS = 30;
// tolua_end // tolua_end
CLASS_PROTODEF(cPlayer) CLASS_PROTODEF(cPlayer)