From f46037b4b32356e94cf8564bc9486b1b13d2dbda Mon Sep 17 00:00:00 2001 From: Erik Schilling Date: Thu, 21 Feb 2013 08:33:49 +0100 Subject: Removed loading of script files using the statusmanager They are now required via the main.lua. Also made Harmony giving you the plague in order to allow testing. --- src/game-server/statusmanager.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src') diff --git a/src/game-server/statusmanager.cpp b/src/game-server/statusmanager.cpp index 7769ef0..389c4cc 100644 --- a/src/game-server/statusmanager.cpp +++ b/src/game-server/statusmanager.cpp @@ -22,8 +22,6 @@ #include "common/resourcemanager.h" #include "game-server/statuseffect.h" -#include "scripting/script.h" -#include "scripting/scriptmanager.h" #include "utils/logger.h" #include "utils/xml.h" @@ -86,7 +84,6 @@ void StatusManager::reload() } } - std::string scriptFile = XML::getProperty(node, "script", std::string()); //TODO: Get these modifiers /* modifiers.setAttributeValue(BASE_ATTR_PHY_ATK_MIN, XML::getProperty(node, "attack-min", 0)); @@ -100,20 +97,7 @@ void StatusManager::reload() modifiers.setAttributeValue(CHAR_ATTR_INTELLIGENCE, XML::getProperty(node, "intelligence", 0)); modifiers.setAttributeValue(CHAR_ATTR_WILLPOWER, XML::getProperty(node, "willpower", 0)); */ - if (!scriptFile.empty()) - { - std::stringstream filename; - filename << "scripts/status/" << scriptFile; - if (ResourceManager::exists(filename.str())) // file exists! - { - LOG_INFO("Loading status script: " << filename.str()); - Script *s = ScriptManager::currentState(); - s->loadFile(filename.str()); - } else { - LOG_WARN("Could not find script file \"" << filename.str() - << "\" for status #"<