diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-02-26 22:06:10 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-02 18:12:07 +0100 |
commit | 34ac0d64e23f2b2d3981dbb0ea72157f334805dd (patch) | |
tree | 114b1f7a65956c097f7a59078292c9fa29c6451f /src/game-server/mapcomposite.cpp | |
parent | e896d0b0125b48e12d43d99ace4498e56d968d50 (diff) | |
download | manaserv-34ac0d64e23f2b2d3981dbb0ea72157f334805dd.tar.gz manaserv-34ac0d64e23f2b2d3981dbb0ea72157f334805dd.tar.bz2 manaserv-34ac0d64e23f2b2d3981dbb0ea72157f334805dd.tar.xz manaserv-34ac0d64e23f2b2d3981dbb0ea72157f334805dd.zip |
Merged all the different Lua states into one
No more Lua state for each status effect, monster, item effect or map. All
scripts are loaded into the same state. This should be more efficient overall
and make it easier to implement dynamic reloading of the scripts in the
future.
Now, this introduces the problem of name collisions between different Lua
scripts. For now this is solved by using more specific function names, like
'tick_plague' and 'tick_jump' rather than just 'tick'. The plan is however
to get rid of these globals, and register these callbacks from the script,
so that they can be local functions without the danger of colliding with
other scripts.
Reviewed-by: Erik Schilling
Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/game-server/mapcomposite.cpp')
-rw-r--r-- | src/game-server/mapcomposite.cpp | 57 |
1 files changed, 12 insertions, 45 deletions
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index 99590566..c9090008 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -34,6 +34,7 @@ #include "game-server/spawnarea.h" #include "game-server/trigger.h" #include "scripting/script.h" +#include "scripting/scriptmanager.h" #include "utils/logger.h" #include "utils/point.h" @@ -458,7 +459,6 @@ MapZone& MapContent::getZone(const Point &pos) const MapComposite::MapComposite(int id, const std::string &name): mMap(NULL), mContent(NULL), - mScript(NULL), mName(name), mID(id) { @@ -468,7 +468,6 @@ MapComposite::~MapComposite() { delete mMap; delete mContent; - delete mScript; } bool MapComposite::activate() @@ -494,12 +493,10 @@ bool MapComposite::activate() else mPvPRules = PVP_NONE; - if (Script *s = getScript()) - { - s->setMap(this); - s->prepare("initialize"); - s->execute(); - } + Script *s = ScriptManager::currentState(); + s->setMap(this); + s->prepare("initialize"); + s->execute(); return true; } @@ -730,25 +727,12 @@ void MapComposite::initializeContent() int npcId = utils::stringToInt(object->getProperty("NPC_ID")); std::string scriptText = object->getProperty("SCRIPT"); - if (!mScript) - { - // Determine script engine by xml property - std::string scriptEngineName = object->getProperty("ENGINE"); - if (scriptEngineName.empty()) - { - // Set engine to default value and print warning - scriptEngineName = Configuration::getValue("script_defaultEngine", "lua"); - LOG_WARN("No script engine specified for map script \"" - + mName + "\", falling back to default"); - } - mScript = Script::create(scriptEngineName); - } - if (npcId && !scriptText.empty()) { - mScript->loadNPC(object->getName(), npcId, - object->getX(), object->getY(), - scriptText.c_str()); + Script *script = ScriptManager::currentState(); + script->loadNPC(object->getName(), npcId, + object->getX(), object->getY(), + scriptText.c_str()); } else { @@ -760,33 +744,16 @@ void MapComposite::initializeContent() std::string scriptFilename = object->getProperty("FILENAME"); std::string scriptText = object->getProperty("TEXT"); - if (!mScript) - { - // Determine script engine by xml property - std::string scriptEngineName = object->getProperty("ENGINE"); - if (!scriptFilename.empty() && scriptEngineName.empty()) - { - // Engine property is empty - determine by filename - scriptEngineName = Script::determineEngineByFilename(scriptFilename); - } - else if (scriptEngineName.empty()) - { - // Set engine to default value and print warning - scriptEngineName = Configuration::getValue("script_defaultEngine", "lua"); - LOG_WARN("No script engine specified for map script \"" - + mName + "\", falling back to default"); - } - mScript = Script::create(scriptEngineName); - } + Script *script = ScriptManager::currentState(); if (!scriptFilename.empty()) { - mScript->loadFile(scriptFilename); + script->loadFile(scriptFilename); } else if (!scriptText.empty()) { std::string name = "'" + object->getName() + "'' in " + mName; - mScript->load(scriptText.c_str(), name.c_str()); + script->load(scriptText.c_str(), name.c_str()); } else { |