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

Added E_EFFECT_<Effect>

Browse Source
This commit is contained in:
STRWarrior 2013-12-14 22:23:20 +01:00
parent 123799a4e0
commit 71250b275f
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Entities/Effects.h Normal file
View File

@ -0,0 +1,29 @@
#pragma once
// tolua_begin
enum ENUM_ENTITY_EFFECT
{
E_EFFECT_SPEED = 1,
E_EFFECT_SLOWNESS = 2,
E_EFFECT_HASTE = 3,
E_EFFECT_MINING_FATIGUE = 4,
E_EFFECT_STENGTH = 5,
E_EFFECT_INSTANT_HEALTH = 6,
E_EFFECT_INSTANT_DAMAGE = 7,
E_EFFECT_JUMP_BOOST = 8,
E_EFFECT_NAUSEA = 9,
E_EFFECT_REGENERATION = 10,
E_EFFECT_RESISTANCE = 11,
E_EFFECT_FIRE_RESISTANCE = 12,
E_EFFECT_WATER_BREATHING = 13,
E_EFFECT_INVISIBILITY = 14,
E_EFFECT_BLINDNESS = 15,
E_EFFECT_NIGHT_VISION = 16,
E_EFFECT_HUNGER = 17,
E_EFFECT_WEAKNESS = 18,
E_EFFECT_POISON = 19,
E_EFFECT_WITHER = 20,
E_EFFECT_HEALTH_BOOST = 21,
E_EFFECT_ABSORPTION = 22,
E_EFFECT_SATURATION = 23,
} ;

6
src/Entities/Player.cpp
View File

@ -557,12 +557,12 @@ void cPlayer::FoodPoison(int a_NumTicks)
m_FoodPoisonedTicksRemaining = std::max(m_FoodPoisonedTicksRemaining, a_NumTicks);
if (!HasBeenFoodPoisoned)
{
m_ClientHandle->SendRemoveEntityEffect(*this, 17);
m_ClientHandle->SendRemoveEntityEffect(*this, E_EFFECT_HUNGER);
SendHealth();
}
else
{
m_ClientHandle->SendEntityEffect(*this, 17, 0, 20);
m_ClientHandle->SendEntityEffect(*this, E_EFFECT_HUNGER, 0, 20);
}
}
@ -1710,7 +1710,7 @@ void cPlayer::HandleFood(void)
}
else
{
m_ClientHandle->SendRemoveEntityEffect(*this, 17); // remove the "Hunger" effect.
m_ClientHandle->SendRemoveEntityEffect(*this, E_EFFECT_HUNGER); // remove the "Hunger" effect.
}
// Apply food exhaustion that has accumulated: