Merge pull request #346 from mekolat/global-handler

onlogin & cleanup

2 files changed, 2 insertions, 7 deletions

diff --git a/world/map/npc/002-2/kylian.txt b/world/map/npc/002-2/kylian.txt
index 346fcffa..c5ed0baf 100644
--- a/world/map/npc/002-2/kylian.txt
+++ b/world/map/npc/002-2/kylian.txt
@@ -26,11 +26,11 @@
 // state 8: Kylian was in the casino and gives a desert hat as reward
 // state 9: Shop approved, go talk Kylian's shopkeeper if you are looking for work.
 // state 10: Meet Shop keeper
-// state 11: Start Time Trial 
+// state 11: Start Time Trial
 // state 12: Return
 // state 13: Start Daily Timed
 // state 14: Return
-// state 15: Completed 
+// state 15: Completed
 // Kylian_Timer is used to denote start time.
 
 // temporary variables used to check if the player logged out or left the building in the meanwhile
@@ -82,8 +82,6 @@ OnInit:
     set @fun_money, 50;
     set @fun_exp, 20;
 
-    // This NPC previously used the variable TMW_Quest
-    callfunc "ClearVarTMW_Quest";
     set @fieri, ((QUEST_SouthTulimshar & NIBBLE_6_MASK) >> NIBBLE_6_SHIFT);
 
     if (@state == 15) goto L_Done;
@@ -366,7 +364,6 @@ function|script|SetKylianQuest
 function|script|KylianDebug
 {
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
-    callfunc "ClearVarTMW_Quest";
     set @fieri, ((QUEST_SouthTulimshar & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
     set @run, ((QUEST_NorthTulimshar & TWOBIT_8_MASK) >> TWOBIT_8_SHIFT);
     set @run_cnt, ((QUEST_NorthTulimshar & TWOBIT_9_MASK) >> TWOBIT_9_SHIFT);
diff --git a/world/map/npc/002-2/troupe_leader.txt b/world/map/npc/002-2/troupe_leader.txt
index de8517c5..79c85dc6 100644
--- a/world/map/npc/002-2/troupe_leader.txt
+++ b/world/map/npc/002-2/troupe_leader.txt
@@ -2,8 +2,6 @@
 
 002-2,81,21,0|script|Troupe Leader|165
 {
-    callfunc "ClearVariables";
-
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
     if (@inspector == 4) goto L_NohMask_Troupe;