summaryrefslogtreecommitdiff
path: root/src/game-server/monstermanager.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2009-08-20 01:18:57 +0200
committerPhilipp Sehmisch <crush@themanaworld.org>2009-08-20 01:20:47 +0200
commit936c2d31127871e86918cf4e735da75186582543 (patch)
treeae9c80d6b2c8675fe230145dd70c52de9fd63d06 /src/game-server/monstermanager.cpp
parente706c092f3b28ff4e5bd229ce3a00e604828ce89 (diff)
downloadmanaserv-936c2d31127871e86918cf4e735da75186582543.tar.gz
manaserv-936c2d31127871e86918cf4e735da75186582543.tar.bz2
manaserv-936c2d31127871e86918cf4e735da75186582543.tar.xz
manaserv-936c2d31127871e86918cf4e735da75186582543.zip
Removed remnants of attack zones. Monsters AI now works properly again.
Diffstat (limited to 'src/game-server/monstermanager.cpp')
-rw-r--r--src/game-server/monstermanager.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp
index d7f301c8..426a2249 100644
--- a/src/game-server/monstermanager.cpp
+++ b/src/game-server/monstermanager.cpp
@@ -24,7 +24,6 @@
#include "game-server/monstermanager.hpp"
#include "defines.h"
-#include "game-server/attackzone.hpp"
#include "game-server/itemmanager.hpp"
#include "game-server/monster.hpp"
#include "game-server/resourcemanager.hpp"
@@ -222,17 +221,12 @@ void MonsterManager::reload()
else if (xmlStrEqual(subnode->name, BAD_CAST "attack"))
{
MonsterAttack *att = new MonsterAttack;
- AttackZone attackZone;
att->id = XML::getProperty(subnode, "id", 0);
att->priority = XML::getProperty(subnode, "priority", 1);
att->damageFactor = XML::getFloatProperty(subnode, "damage-factor", 1.0f);
att->preDelay = XML::getProperty(subnode, "pre-delay", 1);
att->aftDelay = XML::getProperty(subnode, "aft-delay", 0);
- attackZone.multiTarget = true;
- attackZone.shape = ATTZONESHAPE_CONE;
- attackZone.range = XML::getProperty(subnode, "range", 1);
- attackZone.angle = XML::getProperty(subnode, "angle", 1);
- att->attackZone = attackZone;
+ att->range = XML::getProperty(subnode, "range", 0);
std::string sElement = XML::getProperty(subnode, "element", "neutral");
att->element = elementFromString(sElement);
std::string sType = XML::getProperty(subnode, "type", "physical");