summaryrefslogtreecommitdiff
path: root/npc/functions/soul_menhir.txt
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-05-16 15:20:10 +0000
committerFate <fate-tmw@googlemail.com>2009-05-16 15:20:10 +0000
commit9c025c897e112583b68de9d8545f81edb95dbe5c (patch)
tree0712c68e84e8f12650d07a90420003b6fd9e1cdd /npc/functions/soul_menhir.txt
parent25c4fee3bc0196a381b529f495bce8143ee0f501 (diff)
parent25789740c889c6f37d31b32cebb741ab7cfeb869 (diff)
downloadserverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.gz
serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.bz2
serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.tar.xz
serverdata-9c025c897e112583b68de9d8545f81edb95dbe5c.zip
Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline
Conflicts: db/item_db.txt npc/013-3_Cave/barrier.txt
Diffstat (limited to 'npc/functions/soul_menhir.txt')
-rw-r--r--npc/functions/soul_menhir.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index ccedc319..25ccc4db 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -5,7 +5,7 @@ function script SoulMenhir {
menu
"Touch it", -,
- "Leave it alone", return;
+ "Leave it alone", L_Return;
if (Menhir_Activated == 1) goto L_Shortversion;
@@ -31,5 +31,7 @@ L_Shortversion:
L_Save:
savepoint @map$, @x, @y;
+
+L_Return:
return;
}