summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/monster.cpp4
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 <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);
}