Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 14 insertions, 12 deletions

diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 78635c54..939f4ae2 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -1,5 +1,6 @@
 //# see detailed description at orum.txt
-function|script|GetBarrierColor|{
+function|script|GetBarrierColor|,
+{
     if (@Barrier < 0 || @Barrier > 2) goto L_Error;
 
     set @Mask, 15;
@@ -12,7 +13,8 @@ L_Error:
     close;
 }
 
-function|script|SetBarrierColor|{
+function|script|SetBarrierColor|,
+{
     if (@Barrier < 0 || @Barrier > 2)
         goto L_Error;
     if (@BarrierColor <= 0 || @BarrierColor > 12)
@@ -33,8 +35,8 @@ L_Error2:
 
 
 // Starting Barrier / Quest Entrance
-009-4.gat,37,120,0|script|#OrumCaveStartBarrier|0,1,0,{
-
+009-4.gat,37,120,0|script|#OrumCaveStartBarrier|0,1,0,
+{
     if (OrumQuest >= 3) close;
     if (OrumQuest == 2) goto L_Started;
 
@@ -49,8 +51,8 @@ L_Started:
 }
 
 // First Barrier
-009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|0,1,0,{
-
+009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|0,1,0,
+{
     if (OrumQuest >= 5) close;
 
     message strcharinfo(0), "Nothing seems to happen as you enter this room. The barrier must need both of its torches to function properly.";
@@ -59,8 +61,8 @@ L_Started:
 }
 
 // Second Barrier
-009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|0,1,0,{
-
+009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|0,1,0,
+{
     if (OrumQuest == 3) set OrumQuest, 4;
 
     set @Barrier, 0;
@@ -88,8 +90,8 @@ L_Advance_Quest:
 }
 
 // Third Barrier
-009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|0,1,0,{
-
+009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|0,1,0,
+{
     if (OrumQuest == 3) set OrumQuest, 4;
 
     set @Barrier, 1;
@@ -132,8 +134,8 @@ L_Advance_Quest:
 }
 
 // Ending Barrier
-009-4.gat,48,38,0|script|#OrumCaveEndBarrier|0,1,0,{
-
+009-4.gat,48,38,0|script|#OrumCaveEndBarrier|0,1,0,
+{
     if (OrumQuest >= 11) close;
     if (OrumQuest == 3) set OrumQuest, 4;