summaryrefslogtreecommitdiff
path: root/npc/functions
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-10 04:26:44 -0600
committerJared Adams <jaxad0127@gmail.com>2009-03-10 04:26:44 -0600
commit181f0c4b223bf995d080387e791034a0d93b72e1 (patch)
tree81ae9b8250d19c035cd0cc8270085c58fce918ac /npc/functions
parente5ac95f237d5c96c39e3b5573d198138f855e30d (diff)
parent7700a8695ed7710e2322ec1669353f7650f1a9b5 (diff)
downloadserverdata-181f0c4b223bf995d080387e791034a0d93b72e1.tar.gz
serverdata-181f0c4b223bf995d080387e791034a0d93b72e1.tar.bz2
serverdata-181f0c4b223bf995d080387e791034a0d93b72e1.tar.xz
serverdata-181f0c4b223bf995d080387e791034a0d93b72e1.zip
Merge commit 'mainline/master'
Conflicts: npc/020-1_Nivalis/_import.txt
Diffstat (limited to 'npc/functions')
-rw-r--r--npc/functions/soul_menhir.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index f807b7fb..ccedc319 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -31,4 +31,5 @@ L_Shortversion:
L_Save:
savepoint @map$, @x, @y;
+ return;
}