Merge branch 'master' into lpc2012

Conflicts:
	gameserver.cbp
	src/account-server/accounthandler.cpp
	src/game-server/attack.cpp
	src/game-server/attack.h
	src/game-server/being.cpp
	src/game-server/being.h
	src/game-server/character.cpp
	src/game-server/character.h
	src/game-server/inventory.cpp
	src/game-server/item.h
	src/game-server/monster.cpp
	src/game-server/monster.h

1 files changed, 2 insertions, 0 deletions

diff --git a/src/game-server/npc.cpp b/src/game-server/npc.cpp
index 82cd6a51..ce6ac32e 100644
--- a/src/game-server/npc.cpp
+++ b/src/game-server/npc.cpp
@@ -54,6 +54,8 @@ void NPC::update()
         return;
 
     Script *script = ScriptManager::currentState();
+    script->setMap(getMap());
+
     script->prepare(mUpdateCallback);
     script->push(this);
     script->execute();