Merge pull request #214 from mekolat/mapexit

use builtin mapexit

4 files changed, 10 insertions, 13 deletions

diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index 698aa65f..a8bbc20b 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -163,8 +163,7 @@ OnInit:
     end;
 
 L_FAULTY_SETUP:
-    gmcommand "@mapexit";
-    end;
+    mapexit;
 
 OnTimer1000:
     setnpctimer 0;
diff --git a/world/map/npc/009-7/trapdoor.txt b/world/map/npc/009-7/trapdoor.txt
index 7ab6b0b6..aff98cbd 100644
--- a/world/map/npc/009-7/trapdoor.txt
+++ b/world/map/npc/009-7/trapdoor.txt
@@ -58,6 +58,6 @@ L_Close:
 OnInit:
     setarray $@fightclub_randompasswords$, "Abibliophobia", "Anencephalous", "Batrachomyomachy", "Blunderbuss", "Boustrophedon", "Bumbershoot", "Canoodle", "Cockalorum", "Cockamamie", "Collywobbles", "Eructation", "Flibbertigibbet", "Formication", "Gaberlunzie", "Gastromancy", "Gobemouche", "Hemidemisemiquaver", "Hobbledehoy", "Hootenanny", "Lickspittle", "Lollygag", "Mumpsimus", "Nincompoop", "Oocephalus", "Pettifogger", "Sialoquent", "Slangwhanger", "Smellfungus", "Tatterdemalion", "Vomitory", "Widdershins", "Avoirdupois", "Embonpoint", "Bibble", "Erinaceous", "Impignorate", "Nudiustertian", "Tittynope", "Winklepicker", "Yarborough", "Floccinaucinihilipilification";
     setarray $@fightclub_definitions$, "The fear of running out of reading material","Lacking a brain","Making a mountain out of a molehill","A gun with a flared muzzle or disorganized activity","A back and forth pattern","An umbrella","To hug and kiss","A small, haughty man","Absurd, outlandish","Butterflies in the stomach","A burp, belch","Nonsense, balderdash","The sense of ants crawling on your skin","A wandering beggar","Telling fortune from the rumblings of the stomach","A highly gullible person","A musical timing of 1/64","An awkward or ill-mannered young boy","A country or folk music get-together","A servile person, a toady","To move slowly, fall behind","To move slowly, fall behind","A foolish person","An egghead","A person who tries to befuddle others with his speech","Spitting while speaking","A loud abusive speaker or obnoxious writer","A perpetual pessimist","A child in rags","An exit or outlet","In a contrary or counterclockwise direction", "Commodities sold by weight", "A plump, hourglass figure", "To drink often; to eat and/or drink noisily", "Resembling a hedgehog", "To pawn or mortgage something", "The day before yesterday", "A small quantity of something left over", "Style of shoe or boot with a sharp and long pointed toe", "Hand of cards containing no card above a nine", "Estimation that something is valueless";
-    if(getarraysize($@fightclub_randompasswords$) != getarraysize($@fightclub_definitions$)) gmcommand "@mapexit";
+    if(getarraysize($@fightclub_randompasswords$) != getarraysize($@fightclub_definitions$)) mapexit;
     end;
 }
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt
index 226d8bbb..0401fc3d 100644
--- a/world/map/npc/annuals/halloween/config.txt
+++ b/world/map/npc/annuals/halloween/config.txt
@@ -339,11 +339,11 @@ L_Main:
 
     if(gettime(6) <= $@halloween_end_month && gettime(5) > $@halloween_reward_end_day)
         goto L_NoEventTime;
-    if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day 
+    if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day
             && (gettime(5) <= $@halloween_reward_end_day && $@halloween_reward_start_month == $@halloween_end_month
                 || !($@halloween_reward_start_month == $@halloween_end_month)))
-        || (gettime(6) == $@halloween_end_month && gettime(5) <= $@halloween_reward_end_day 
-            && (gettime(5) >= $@halloween_reward_start_day && $@halloween_reward_start_month == $@halloween_end_month 
+        || (gettime(6) == $@halloween_end_month && gettime(5) <= $@halloween_reward_end_day
+            && (gettime(5) >= $@halloween_reward_start_day && $@halloween_reward_start_month == $@halloween_end_month
                 || !($@halloween_reward_start_month == $@halloween_end_month)))
         || (gettime(6) < $@halloween_end_month && gettime(6) > $@halloween_reward_start_month))
         goto L_RewardTime;
@@ -372,6 +372,5 @@ L_Return:
 
 L_HalloweenError:
     debugmes "Halloween is Dead Jim.";
-    gmcommand "@mapexit";
-    end;
+    mapexit;
 }
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index 70eb5b05..e95494d3 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -262,11 +262,11 @@ L_Main:
     set $@xmas_spawn_y2, 89;
     set $@xmas_respawn_count, 9;
 
-    if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day 
+    if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day
             && (gettime(5) <= $@xmas_reward_end_day && $@xmas_reward_start_month == $@xmas_end_month
                 || !($@xmas_reward_start_month == $@xmas_end_month)))
-        || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_day 
-            && (gettime(5) >= $@xmas_reward_start_day && $@xmas_reward_start_month == $@xmas_end_month 
+        || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_day
+            && (gettime(5) >= $@xmas_reward_start_day && $@xmas_reward_start_month == $@xmas_end_month
                 || !($@xmas_reward_start_month == $@xmas_end_month)))
         || (gettime(6) < $@xmas_end_month && gettime(6) > $@xmas_reward_start_month))
         goto L_RewardTime;
@@ -299,6 +299,5 @@ L_Return:
 
 L_XmasError:
     debugmes "Xmas is Dead Jim.";
-    gmcommand "@mapexit";
-    end;
+    mapexit;
 }