summaryrefslogtreecommitdiff
path: root/src/monster.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-03-23 01:27:13 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-03-23 01:27:13 +0000
commit9dd811b55587aeb76344b835006cb4a01601bb5d (patch)
treebd297391e264a09ce8467bcf780927a4cef09991 /src/monster.cpp
parentbd8a35eca8c2fa6eb33e7d9219e3fa4d287a2059 (diff)
downloadmana-client-9dd811b55587aeb76344b835006cb4a01601bb5d.tar.gz
mana-client-9dd811b55587aeb76344b835006cb4a01601bb5d.tar.bz2
mana-client-9dd811b55587aeb76344b835006cb4a01601bb5d.tar.xz
mana-client-9dd811b55587aeb76344b835006cb4a01601bb5d.zip
Merged revisions 3823,3825-3826,3829,3831-3839,3841-3842 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r3823 | crush_tmw | 2007-12-28 19:36:58 +0100 (Fri, 28 Dec 2007) | 1 line Added the possibility to assign particle effects to monsters in the monster database. Added flame particle effect to fire goblin as a proof of concept. ........ r3826 | crush_tmw | 2007-12-30 01:02:14 +0100 (Sun, 30 Dec 2007) | 1 line Added a key for targeting the nearest player character based on patches by Trinexx. Some mapping fixes at snake dungeon map. ........ r3839 | the_enemy | 2008-01-13 17:28:50 +0100 (Sun, 13 Jan 2008) | 1 line Fixed non-default location music loading ........ r3842 | crush_tmw | 2008-01-14 11:48:13 +0100 (Mon, 14 Jan 2008) | 1 line ixed an error in Davids last commit (couldn't compile that way). ........
Diffstat (limited to 'src/monster.cpp')
-rw-r--r--src/monster.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/monster.cpp b/src/monster.cpp
index abc7946f..1561b2ea 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -36,12 +36,21 @@
Monster::Monster(Uint16 id, Uint16 job, Map *map):
Being(id, job, map)
{
- std::string filename = getInfo().getSprite();
+ const MonsterInfo& info = getInfo();
+ std::string filename = info.getSprite();
if (filename.empty())
filename = "error.xml";
mSprites[BASE_SPRITE] =
AnimatedSprite::load("graphics/sprites/" + filename);
+
+ const std::list<std::string> &particleEffects = info.getParticleEffects();
+ for (std::list<std::string>::const_iterator i = particleEffects.begin();
+ i != particleEffects.end();
+ i++)
+ {
+ controlParticle(particleEngine->addEffect((*i), 0, 0));
+ }
}
Monster::~Monster()