diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game-server/mapcomposite.cpp | 2 | ||||
| -rw-r--r-- | src/scripting/luascript.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index 8dd0503e..c3df7202 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -799,6 +799,7 @@ void MapComposite::initializeContent() if (npcId && !scriptText.empty()) { Script *script = ScriptManager::currentState(); + script->setMap(this); script->loadNPC(object->getName(), npcId, ManaServ::getGender(gender), object->getX(), object->getY(), @@ -815,6 +816,7 @@ void MapComposite::initializeContent() std::string scriptText = object->getProperty("TEXT"); Script *script = ScriptManager::currentState(); + script->setMap(this); if (!scriptFilename.empty()) { diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp index bdff6a12..e2b127f7 100644 --- a/src/scripting/luascript.cpp +++ b/src/scripting/luascript.cpp @@ -234,6 +234,7 @@ void LuaScript::load(const char *prog, const char *name) << lua_tostring(mRootState, -1)); lua_pop(mRootState, 1); } + setMap(0); } void LuaScript::processDeathEvent(Being *entity) |