Merge commit 'mainline/master'

Conflicts:
	npc/001-1_Tulimshar/elanore.txt
	npc/013-3_Cave/barrier.txt
	npc/015-3/katze.txt

8 files changed, 6 insertions, 3 deletions

diff --git a/npc/001-1_Tulimshar/banker.txt b/npc/001-1_Tulimshar/banker.txt
index f94ea304..4fc05f62 100644
--- a/npc/001-1_Tulimshar/banker.txt
+++ b/npc/001-1_Tulimshar/banker.txt
@@ -1,4 +1,5 @@
 001-1.gat,57,52,0	script	Tybalt	107,{
 	set @npcName$, "Tybalt";
 	callfunc "Banker";
+	close;
 }
diff --git a/npc/001-1_Tulimshar/constable.txt b/npc/001-1_Tulimshar/constable.txt
index c07889c6..f6423d5a 100644
--- a/npc/001-1_Tulimshar/constable.txt
+++ b/npc/001-1_Tulimshar/constable.txt
@@ -4,4 +4,5 @@
 //	set @npcName$, "Constable Perry Graf";
 	set @canSkip, 1;
 	callfunc "GameRules";
+	close;
 }
diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt
index 0c56ecf7..f75e154b 100644
--- a/npc/001-1_Tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
@@ -422,4 +422,3 @@ S_update_var:
 		| (@Q_status << @Q_SHIFT));
 	return;
 }
-
diff --git a/npc/001-1_Tulimshar/guards.txt b/npc/001-1_Tulimshar/guards.txt
index 366f4475..ce7556a7 100644
--- a/npc/001-1_Tulimshar/guards.txt
+++ b/npc/001-1_Tulimshar/guards.txt
@@ -72,5 +72,5 @@ L_disaster:
 	mes "[Ryan the Town Guard]";
 	mes "\"Hmmmmmmh...?";
 	mes "Oh, I wasn't sleeping, I was just resting my eyes!\"";
-close;
+	close;
 }
diff --git a/npc/001-1_Tulimshar/rules.txt b/npc/001-1_Tulimshar/rules.txt
index a67eeb14..1a0f3b82 100644
--- a/npc/001-1_Tulimshar/rules.txt
+++ b/npc/001-1_Tulimshar/rules.txt
@@ -4,4 +4,5 @@
 	if (TUT_var & 1 == 1) close;
 	callfunc "GameRules";
 	mes "Ian, the trainer, can help you get to know the game.";
+	close;
 }
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index e1e2f652..a2762181 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -101,4 +101,5 @@ L_TooMany:
 	next;
 	mes "[Sandra]";
 	mes "\"You don't have room for my reward. I'll wait until you do.\"";
+	close;
 }
diff --git a/npc/001-1_Tulimshar/soul-menhir.txt b/npc/001-1_Tulimshar/soul-menhir.txt
index 45c5dfea..58e450a6 100644
--- a/npc/001-1_Tulimshar/soul-menhir.txt
+++ b/npc/001-1_Tulimshar/soul-menhir.txt
@@ -5,4 +5,5 @@
 	set @x, 38;
 	set @y, 70;
 	callfunc "SoulMenhir";
+	close;
 }
diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index b8997e8f..af6f4b55 100644
--- a/npc/001-1_Tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
@@ -102,4 +102,3 @@ L_Done:
 	mes "\"Thanks for your help!\"";
 	close;
 }
-