From 00f7d56663c4e77ca0c3093afb995a3f00563a76 Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond Date: Thu, 18 Oct 2007 13:25:28 +0000 Subject: Merged client and server monster data. --- ChangeLog | 2 ++ src/monster.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbbbf623..ad667db1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 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); } -- cgit v1.2.3-70-g09d2