Merge remote branch 'mainline/master'

Conflicts:
	npc/027-2_Caretakers_House/gy_inn_shops.txt
	npc/027-2_Caretakers_House/testnpcs.txt

1 files changed, 7 insertions, 26 deletions

diff --git a/npc/027-2_Caretakers_House/testnpcs.txt b/npc/027-2_Caretakers_House/testnpcs.txt
index 8f6721c9..a64e80b9 100755
--- a/npc/027-2_Caretakers_House/testnpcs.txt
+++ b/npc/027-2_Caretakers_House/testnpcs.txt
@@ -22,26 +22,7 @@
 }

 

 027-2.gat,118,23,0	script	Werewolf	305,{

-	mes "debug for the lovetriangle quest";

-	menu

-		"reset reid", -,

-		"leave", L_Close;

-

-	set @Graveyard_Inn_MASK, NIBBLE_0_MASK;

-	set @Graveyard_Inn_SHIFT, NIBBLE_0_SHIFT;

-

-	set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);

-	set @state, 0;

-	callsub S_Update_Mask;

-	

-L_Close:

-	close;

-

-S_Update_Mask:

-        set QUEST_Graveyard_Inn,

-        	(QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK))

-                | (@state << @Graveyard_Inn_SHIFT);

-        return;

+	end;

 }

 

 027-2.gat,75,29,0	script	Archibald	306,{

@@ -91,13 +72,13 @@ L_3:
 	end;

 }

 

-//027-2.gat,50,92,0	script	Crying Child	314,{

-//	end;

-//}

+027-2.gat,50,92,0	script	Crying Child	314,{

+	end;

+}

 

-//027-2.gat,104,39,0	script	Innkeeper's Ghost	315,{

-//	end;

-//}

+027-2.gat,104,39,0	script	Innkeeper's Ghost	315,{

+	end;

+}

 

 027-2.gat,100,43,0	script	Evil Guard	316,{

 	end;