From 907b740c17a69a487126c63f6ff917d494a25a1f Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Fri, 13 Jul 2012 16:20:26 +0200
Subject: Fixed the atinit function

Previously each map had its own scope. They got merged now but the atinit
function was forgotten to adapt.
---
 src/game-server/mapcomposite.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/game-server/mapcomposite.cpp')

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())
             {
-- 
cgit v1.2.3-70-g09d2