From 2f68a9da7121ab2adaa70ff257577ee596b4c4ee Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Mon, 26 Mar 2012 20:04:36 +0200 Subject: Some general cleanups and merged Being::perform() into update() The main change here is to remove the separate calling of 'perform' on all beings, and rather rely on the beings to do whatever they were doing in that function when the virtual 'update' function is called. Reviewed-by: Yohann Ferreira --- src/game-server/being.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/game-server/being.cpp') diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp index 3fc0bab..1669e55 100644 --- a/src/game-server/being.cpp +++ b/src/game-server/being.cpp @@ -180,7 +180,8 @@ void Being::died() { const EventListener &l = **i; ++i; // In case the listener removes itself from the list on the fly. - if (l.dispatch->died) l.dispatch->died(&l, this); + if (l.dispatch->died) + l.dispatch->died(&l, this); } } @@ -432,7 +433,7 @@ int Being::performAttack(Being *target, const Damage &damage) // Note: The auto-attack system will handle the delay between two attacks. - return (mTarget->damage(this, damage)); + return target->damage(this, damage); } void Being::setAction(BeingAction action) @@ -640,7 +641,8 @@ void Being::update() //update timers for (Timers::iterator i = mTimers.begin(); i != mTimers.end(); i++) { - if (i->second > -1) i->second--; + if (i->second > -1) + i->second--; } int oldHP = getModifiedAttribute(ATTR_HP); -- cgit