diff options
| author | Daniel Bradshaw <daniel+commits@the-cell.co.uk> | 2010-01-31 13:14:07 +0000 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-01-31 17:50:29 +0100 |
| commit | 2ff6ad2e8a67bd8ef34b56b866ef277c30135f19 (patch) | |
| tree | 536497f63044441a6e8032209446d1c3213b9d55 /src/monster.cpp | |
| parent | 22c75a346e029fad746b6aa0b123c886ddeb5c75 (diff) | |
| download | mana-client-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.tar.gz mana-client-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.tar.bz2 mana-client-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.tar.xz mana-client-2ff6ad2e8a67bd8ef34b56b866ef277c30135f19.zip | |
Unify eAthena and manaserv support in to one build.
Finish support for server types in the server dialog.
Using the new server type function, strip out ifdefs, replacing them with if
blocks for later merging in smaller atomic commits.
Remove any remaining references to the support defs, including in build system.
Diffstat (limited to 'src/monster.cpp')
| -rw-r--r-- | src/monster.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/monster.cpp b/src/monster.cpp index 57a6f229..7da7e759 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -29,6 +29,8 @@ #include "gui/palette.h" +#include "net/net.h" + #include "resources/monsterdb.h" #include "resources/monsterinfo.h" @@ -71,15 +73,13 @@ Monster::Monster(int id, int job, Map *map): void Monster::logic() { -#ifdef EATHENA_SUPPORT - if (mAction != STAND) + if ((Net::getNetworkType() == ServerInfo::EATHENA) && (mAction != STAND)) { mFrame = (int) ((get_elapsed_time(mWalkTime) * 4) / getWalkSpeed()); if (mFrame >= 4 && mAction != DEAD) nextStep(); } -#endif Being::logic(); } |