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

Added iterator on tick to manage entity effect duration

Browse Source
This commit is contained in:
archshift 2014-06-06 20:02:39 -07:00
parent aa7b3f33b9
commit 90145a9514
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Entities/Pawn.cpp
View File

@ -19,7 +19,22 @@ cPawn::cPawn(eEntityType a_EntityType, double a_Width, double a_Height)
void cPawn::Tick(float a_Dt, cChunk & a_Chunk)
{
// Iterate through this entity's applied effects
for (std::map<cEntityEffect::eType, cEntityEffect>::iterator iter = m_EntityEffects.begin();
iter != m_EntityEffects.end();
++iter)
{
// Reduce the effect's duration
iter->second.m_Ticks--;
// Remove effect if duration has elapsed
if (iter->second.m_Ticks <= 0)
{
RemoveEntityEffect(iter->first);
}
// TODO: Check for discrepancies between client and server effect values
}
super::Tick(a_Dt, a_Chunk);
}
@ -31,6 +46,7 @@ void cPawn::Tick(float a_Dt, cChunk & a_Chunk)
void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
{
m_EntityEffects[a_EffectType] = a_Effect;
//m_World->BroadcastEntityEffect(*this, a_EffectType, a_Effect.m_Intensity, a_Effect.m_Ticks);
}
@ -40,4 +56,5 @@ void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_E
void cPawn::RemoveEntityEffect(cEntityEffect::eType a_EffectType)
{
m_EntityEffects.erase(a_EffectType);
//m_World->BroadcastRemoveEntityEffect(*this, a_EffectType);
}