summaryrefslogtreecommitdiff
path: root/src/game-server/monster.cpp
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-02-17 13:36:32 +0100
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-02-17 13:36:32 +0100
commit587b7682e6bf7dd9e616c1d4789a5ed9aa986e6d (patch)
treef3490b1691ae3d6bac0408a497f52eacca2f5214 /src/game-server/monster.cpp
parent3bae58a9bbe10a07c96caa033e332c35009d4add (diff)
downloadmanaserv-587b7682e6bf7dd9e616c1d4789a5ed9aa986e6d.tar.gz
manaserv-587b7682e6bf7dd9e616c1d4789a5ed9aa986e6d.tar.bz2
manaserv-587b7682e6bf7dd9e616c1d4789a5ed9aa986e6d.tar.xz
manaserv-587b7682e6bf7dd9e616c1d4789a5ed9aa986e6d.zip
Monsters no longer load their script files
Before monsters loaded their script file on *each* spawn. This is rather wrong since the script state keeps growing for each monster. However all of this was unnessecary since the main.lua can simply require the script file. If you do not want to spam the main.lua (or any other file) with all the requires: I guess we can add script binds to iterate over all monsters and add some custom properties to the monsters.xml (See Mana-Mantis #356)
Diffstat (limited to 'src/game-server/monster.cpp')
-rw-r--r--src/game-server/monster.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp
index 7d5ec764..47246005 100644
--- a/src/game-server/monster.cpp
+++ b/src/game-server/monster.cpp
@@ -117,9 +117,6 @@ Monster::Monster(MonsterClass *specy):
{
addAttack(*it);
}
-
- // Load default script
- loadScript(specy->getScript());
}
Monster::~Monster()
@@ -288,25 +285,6 @@ void Monster::processAttack(Attack &attack)
}
}
-void Monster::loadScript(const std::string &scriptName)
-{
- if (scriptName.length() == 0)
- return;
-
- std::stringstream filename;
- filename << "scripts/monster/" << scriptName;
- if (ResourceManager::exists(filename.str()))
- {
- LOG_INFO("Loading monster script: " << filename.str());
- ScriptManager::currentState()->loadFile(filename.str());
- }
- else
- {
- LOG_WARN("Could not find script file \""
- << filename.str() << "\" for monster");
- }
-}
-
int Monster::calculatePositionPriority(Point position, int targetPriority)
{
Point thisPos = getPosition();