summaryrefslogtreecommitdiff
path: root/src/monster.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2007-12-23 02:16:53 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2007-12-23 02:16:53 +0000
commitd83e795dc3c8a07238939ee0b581cbfd1807cf1b (patch)
tree5ce6c06c867c61fffe934a67b2636c6c7a9e8b79 /src/monster.cpp
parent8d3e43a7510dd7367c3bb62aae6841836f727493 (diff)
downloadmana-client-d83e795dc3c8a07238939ee0b581cbfd1807cf1b.tar.gz
mana-client-d83e795dc3c8a07238939ee0b581cbfd1807cf1b.tar.bz2
mana-client-d83e795dc3c8a07238939ee0b581cbfd1807cf1b.tar.xz
mana-client-d83e795dc3c8a07238939ee0b581cbfd1807cf1b.zip
Particle images are now reference-counted properly. Avoided attempts to load "data/graphics/" when a monster or equipment piece has no sprite. Error placeholder is now used when attempting to load a sprite definition file that doesn't exist.
Diffstat (limited to 'src/monster.cpp')
-rw-r--r--src/monster.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/monster.cpp b/src/monster.cpp
index 40b36849..779b4f56 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -35,8 +35,16 @@
Monster::Monster(Uint32 id, Uint16 job, Map *map):
Being(id, job, map)
{
- mSprites[BASE_SPRITE] = AnimatedSprite::load(
- "graphics/sprites/" + MonsterDB::get(job - 1002).getSprite());
+ std::string filename = MonsterDB::get(job - 1002).getSprite();
+ if (filename != "")
+ {
+ mSprites[BASE_SPRITE] = AnimatedSprite::load(
+ "graphics/sprites/" + filename);
+ }
+ else
+ {
+ mSprites[BASE_SPRITE] = AnimatedSprite::load("graphics/sprites/error.xml");
+ }
}
void