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

Entity effect type: use 'eff' as a prefix instead of 'ef'

Browse Source
This commit is contained in:
archshift
2014-06-08 03:27:22 -07:00
parent 58f35af6e7
commit 73cea7065d
5 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Entities/Player.cpp
View File

@@ -570,7 +570,7 @@ bool cPlayer::Feed(int a_Food, double a_Saturation)
void cPlayer::FoodPoison(int a_NumTicks)
{
AddEntityEffect(cEntityEffect::efHunger, cEntityEffect(a_NumTicks, 0, NULL));
AddEntityEffect(cEntityEffect::effHunger, cEntityEffect(a_NumTicks, 0, NULL));
}
@@ -1872,17 +1872,17 @@ void cPlayer::HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffe
switch (a_EffectType)
{
// Effects whose behaviors are overridden
case cEntityEffect::efMiningFatigue:
case cEntityEffect::effMiningFatigue:
{
// TODO: Implement me!
return;
}
case cEntityEffect::efHunger:
case cEntityEffect::effHunger:
{
m_FoodExhaustionLevel += 0.025; // 0.5 per second = 0.025 per tick
return;
}
case cEntityEffect::efSaturation:
case cEntityEffect::effSaturation:
{
// Increase saturation 1 per tick, adds 1 for every increase in level
m_FoodSaturationLevel += (1 + a_Effect.GetIntensity());
@@ -1890,8 +1890,8 @@ void cPlayer::HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffe
}
// Client-side-only effects
case cEntityEffect::efNausia:
case cEntityEffect::efNightVision:
case cEntityEffect::effNausea:
case cEntityEffect::effNightVision:
{
return;
}