diff options
author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-21 08:33:49 +0100 |
---|---|---|
committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-21 20:32:11 +0100 |
commit | f46037b4b32356e94cf8564bc9486b1b13d2dbda (patch) | |
tree | c607748cd6e5c5b9819df37189445649953a6032 /src/game-server | |
parent | 4559ca444daacfd02ebb05f1657148a2b4cf3d8b (diff) | |
download | manaserv-f46037b4b32356e94cf8564bc9486b1b13d2dbda.tar.gz manaserv-f46037b4b32356e94cf8564bc9486b1b13d2dbda.tar.bz2 manaserv-f46037b4b32356e94cf8564bc9486b1b13d2dbda.tar.xz manaserv-f46037b4b32356e94cf8564bc9486b1b13d2dbda.zip |
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.
Diffstat (limited to 'src/game-server')
-rw-r--r-- | src/game-server/statusmanager.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/game-server/statusmanager.cpp b/src/game-server/statusmanager.cpp index 7769ef0f..389c4ccd 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 #"<<id); - } - } + statusEffects[id] = statusEffect; } } |