summaryrefslogtreecommitdiff
path: root/world/map/npc/029-1/dock.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
commit0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch)
tree4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/029-1/dock.txt
parenta89882b69d9f12499404ca9d471d5a735bc63988 (diff)
parent135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff)
downloadserverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip
Merge remote-tracking branch 'origin/master' into waric
Conflicts: world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/029-1/dock.txt')
-rw-r--r--world/map/npc/029-1/dock.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/world/map/npc/029-1/dock.txt b/world/map/npc/029-1/dock.txt
index dbc9449d..cf5dd795 100644
--- a/world/map/npc/029-1/dock.txt
+++ b/world/map/npc/029-1/dock.txt
@@ -1,6 +1,7 @@
// The ferry dock
-029-1.gat,22,37,0|script|#candordock|45,2,1,{
+029-1.gat,22,37,0|script|#candordock|45,2,1,
+{
set @loc, DOCK_candor;
callfunc "Ferry";
}