summaryrefslogtreecommitdiff
path: root/src/game-server/quest.cpp
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-02-21 07:29:58 +0100
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-02-21 07:29:58 +0100
commitf93b4c25242370982715e1a83c11e667b17f20af (patch)
tree07b392040bd858e205d12cf8f0977cf82fcc2c90 /src/game-server/quest.cpp
parentbcb3f283bda155bec33c83c4627f59acb4616dd8 (diff)
parent4559ca444daacfd02ebb05f1657148a2b4cf3d8b (diff)
downloadmanaserv-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/quest.cpp')
-rw-r--r--src/game-server/quest.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game-server/quest.cpp b/src/game-server/quest.cpp
index c28a4213..d6d7d92d 100644
--- a/src/game-server/quest.cpp
+++ b/src/game-server/quest.cpp
@@ -82,12 +82,11 @@ void QuestRefCallback::triggerCallback(Character *ch,
return;
Script *s = ScriptManager::currentState();
- s->setMap(ch->getMap());
s->prepare(mRef);
s->push(ch);
s->push(mQuestName);
s->push(value);
- s->execute();
+ s->execute(ch->getMap());
}
static void partialRemove(Entity *t)