diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-10-18 13:25:28 +0000 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-10-18 13:25:28 +0000 |
| commit | 00f7d56663c4e77ca0c3093afb995a3f00563a76 (patch) | |
| tree | 17198367ee3f240d34896c953f43743067c8d11f | |
| parent | d415ba2e8c64e3f8c767fcf56f25a041574704c6 (diff) | |
| download | mana-00f7d56663c4e77ca0c3093afb995a3f00563a76.tar.gz mana-00f7d56663c4e77ca0c3093afb995a3f00563a76.tar.bz2 mana-00f7d56663c4e77ca0c3093afb995a3f00563a76.tar.xz mana-00f7d56663c4e77ca0c3093afb995a3f00563a76.zip | |
Merged client and server monster data.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/monster.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -4,6 +4,8 @@ Removed guess of being type from class number. Factored handler for new beings. * src/gui/truetypefont.cpp: Fixed double-free of true-type resources. + * src/monster.cpp: Removed compatibility hack. + * data/monsters.xml: Merged client and server monster data. 2007-10-15 Bjørn Lindeijer <bjorn@lindeijer.nl> diff --git a/src/monster.cpp b/src/monster.cpp index 2522a3e1..fe78c878 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -36,7 +36,7 @@ Monster::Monster(Uint16 id, Uint16 job, Map *map): Being(id, job, map) { mSprites[BASE_SPRITE] = new AnimatedSprite( - "graphics/sprites/" + MonsterDB::get(job - 1002).getSprite()); + "graphics/sprites/" + getInfo().getSprite()); } Being::Type @@ -102,5 +102,5 @@ Monster::getTargetCursorSize() const const MonsterInfo& Monster::getInfo() const { - return MonsterDB::get(mJob - 1002); + return MonsterDB::get(mJob); } |