diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-03-14 00:05:26 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-03-15 22:53:50 +0100 |
commit | 24f2b307f089558276d1d526f1288d229af11678 (patch) | |
tree | 5fd694e5efda0939542340ba4e691e3374172345 /src/game-server/autoattack.cpp | |
parent | 9f1078ec63298f6e7463125370d5645e0cc49f2b (diff) | |
download | manaserv-24f2b307f089558276d1d526f1288d229af11678.tar.gz manaserv-24f2b307f089558276d1d526f1288d229af11678.tar.bz2 manaserv-24f2b307f089558276d1d526f1288d229af11678.tar.xz manaserv-24f2b307f089558276d1d526f1288d229af11678.zip |
Some code style cleanups in AutoAttack class
Diffstat (limited to 'src/game-server/autoattack.cpp')
-rw-r--r-- | src/game-server/autoattack.cpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/game-server/autoattack.cpp b/src/game-server/autoattack.cpp index b8c8a165..d433b421 100644 --- a/src/game-server/autoattack.cpp +++ b/src/game-server/autoattack.cpp @@ -20,9 +20,9 @@ #include "autoattack.h" -void AutoAttacks::add(AutoAttack n) +void AutoAttacks::add(const AutoAttack &autoAttack) { - mAutoAttacks.push_back(n); + mAutoAttacks.push_back(autoAttack); // Slow, but safe. mAutoAttacks.sort(); } @@ -34,26 +34,38 @@ void AutoAttacks::clear() void AutoAttacks::stop() { - for (std::list<AutoAttack>::iterator it = mAutoAttacks.begin(); it != mAutoAttacks.end(); ++it) + for (std::list<AutoAttack>::iterator it = mAutoAttacks.begin(); + it != mAutoAttacks.end(); ++it) + { it->halt(); + } mActive = false; } void AutoAttacks::start() { - for (std::list<AutoAttack>::iterator it = mAutoAttacks.begin(); it != mAutoAttacks.end(); ++it) + for (std::list<AutoAttack>::iterator it = mAutoAttacks.begin(); + it != mAutoAttacks.end(); ++it) + { it->softReset(); + } mActive = true; } void AutoAttacks::tick(std::list<AutoAttack> *ret) { - for (std::list<AutoAttack>::iterator it = mAutoAttacks.begin(); it != mAutoAttacks.end(); ++it) + for (std::list<AutoAttack>::iterator it = mAutoAttacks.begin(); + it != mAutoAttacks.end(); ++it) + { if (it->tick()) { if (mActive) it->reset(); else it->halt(); - } else if (ret && it->isReady()) + } + else if (ret && it->isReady()) + { ret->push_back(*it); + } + } } |