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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 8 insertions, 5 deletions

diff --git a/world/map/npc/functions/magic.txt b/world/map/npc/functions/magic.txt
index bbd242c8..a1faea94 100644
--- a/world/map/npc/functions/magic.txt
+++ b/world/map/npc/functions/magic.txt
@@ -10,8 +10,8 @@
 // ------------------------------------------------------------
 // Gain initial magic skill
 // ------------------------------------------------------------
-function|script|MagicGainBasic|{
-
+function|script|MagicGainBasic|,
+{
     set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_DRANK_POTION;
     close;
 
@@ -20,7 +20,8 @@ function|script|MagicGainBasic|{
 // ------------------------------------------------------------
 // Initialise Menu for selecting a choice of things to ask about
 // ------------------------------------------------------------
-function|script|MagicTalkOptionsSetup|{
+function|script|MagicTalkOptionsSetup|,
+{
     set @QQ_ELANORE, 1;
     set @QQ_MANASEED, 2;
     set @QQ_MANAPOTION, 4;
@@ -40,7 +41,8 @@ function|script|MagicTalkOptionsSetup|{
 // ------------------------------------------------------------
 
 
-function|script|MagicTalkMenu|{
+function|script|MagicTalkMenu|,
+{
     setarray @choice$, "", "", "", "", "", "", "", "", "", "";
     set @choices_nr, 0;
     setarray @choice_idx, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0;
@@ -159,7 +161,8 @@ L_Q_post_astralsoul:
 // @SUP_name$		name of the skill to level up
 // @SUP_xp		# of experience points to award if the level up succeeds
 // ------------------------------------------------------------
-function|script|SkillUp|{
+function|script|SkillUp|,
+{
     if (getskilllv(@SUP_id) >= @SUP_lvl)
         goto L_shortcut;