diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-21 07:29:58 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-21 07:29:58 +0100 |
| commit | f93b4c25242370982715e1a83c11e667b17f20af (patch) | |
| tree | 07b392040bd858e205d12cf8f0977cf82fcc2c90 /src/game-server/npc.cpp | |
| parent | bcb3f283bda155bec33c83c4627f59acb4616dd8 (diff) | |
| parent | 4559ca444daacfd02ebb05f1657148a2b4cf3d8b (diff) | |
| download | manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.gz manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.bz2 manaserv-f93b4c25242370982715e1a83c11e667b17f20af.tar.xz manaserv-f93b4c25242370982715e1a83c11e667b17f20af.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/game-server/npc.cpp')
| -rw-r--r-- | src/game-server/npc.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game-server/npc.cpp b/src/game-server/npc.cpp index ce6ac32e..2eb73031 100644 --- a/src/game-server/npc.cpp +++ b/src/game-server/npc.cpp @@ -54,11 +54,9 @@ void NPC::update() return; Script *script = ScriptManager::currentState(); - script->setMap(getMap()); - script->prepare(mUpdateCallback); script->push(this); - script->execute(); + script->execute(getMap()); } void NPC::prompt(Character *ch, bool restart) @@ -71,7 +69,7 @@ void NPC::prompt(Character *ch, bool restart) if (restart) { Script::Thread *thread = script->newThread(); - thread->mMap = getMap(); + thread->getContext().map = getMap(); script->prepare(mTalkCallback); script->push(this); script->push(ch); |