diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-21 20:40:07 +0100 |
|---|---|---|
| committer | Chuck Miller <shadowmil@gmail.com> | 2010-02-21 17:05:40 -0500 |
| commit | c8b0d1e56f27c3141895d28b2fc768afffe7bb2d (patch) | |
| tree | 0a03458836badee3e1b0da13a0721c9261e7fa86 /src/monster.cpp | |
| parent | 204a14c91bbe4436eb3b26bebf30cbe5669bdd1a (diff) | |
| download | mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.gz mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.bz2 mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.tar.xz mana-c8b0d1e56f27c3141895d28b2fc768afffe7bb2d.zip | |
Made tick counter and framerate limiter work during login sequence
Much code was moved from main() to the new Client::exec(). This new
event loop now integrates with the Game class, so that the tick counter
and framerate limiter apply universally.
The Client class is also responsible for some things that used to be
global variables.
Mantis-issue: ...
Diffstat (limited to 'src/monster.cpp')
| -rw-r--r-- | src/monster.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/monster.cpp b/src/monster.cpp index 044f80a2..dfe84e65 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -19,10 +19,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "monster.h" + #include "animatedsprite.h" -#include "game.h" +#include "client.h" #include "localplayer.h" -#include "monster.h" #include "particle.h" #include "sound.h" #include "text.h" @@ -38,7 +39,7 @@ Monster::Monster(int id, int job, Map *map): Being(id, job, map), mAttackType(1) { - const MonsterInfo& info = getInfo(); + const MonsterInfo &info = getInfo(); // Setup Monster sprites const std::list<std::string> &sprites = info.getSprites(); |