From 29ddbded7eb9666df30e67f25fcbee467bbd124f Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@gmail.com>
Date: Wed, 12 Nov 2014 20:15:38 -0500
Subject: comply with debug=2

---
 world/map/npc/009-7/debug.txt        | 1 +
 world/map/npc/009-7/eventHandler.txt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'world')

diff --git a/world/map/npc/009-7/debug.txt b/world/map/npc/009-7/debug.txt
index c4877b40..0d66ae48 100644
--- a/world/map/npc/009-7/debug.txt
+++ b/world/map/npc/009-7/debug.txt
@@ -115,6 +115,7 @@ L_OutOfRange:
 
 L_Restart:
     callfunc "fightclub_EmergencyWipe";
+    donpcevent "#FightClubHandler::OnTimer2000"; // this re-starts the main timer if it was stopped
     mes "The temporary variables have been reset.";
     goto L_Menu;
 
diff --git a/world/map/npc/009-7/eventHandler.txt b/world/map/npc/009-7/eventHandler.txt
index fa809fd2..fbcec735 100644
--- a/world/map/npc/009-7/eventHandler.txt
+++ b/world/map/npc/009-7/eventHandler.txt
@@ -87,11 +87,12 @@ OnInit:
     set $@fightclub_x2, 38;
     set $@fightclub_y2, 48;
     callfunc "fightclub_StartUp";
-    if($SANGUINE & $@SV_FCDBit != 0) end;
     callfunc "fightclub_CleanStage";
     goto L_StartTimer;
 
 L_StartTimer:
+    if($SANGUINE & $@SV_FCDBit != 0) end;
+    if(debug >= 2) end;
     setnpctimer 0;
     initnpctimer;
     end;
-- 
cgit v1.2.3-70-g09d2