From 76e551d0752358e6752bb25f5f2e2a6f4412ce97 Mon Sep 17 00:00:00 2001 From: George Date: Sun, 8 Jan 2017 20:02:23 +0000 Subject: [PATCH] I missed a bit - removing DisableHay Following up on 5b70985 --- pawn/Interface/timers.pwn | 4 ---- pawn/Resources/Callbacks/Others/OnDialogResponse.pwn | 2 -- pawn/Resources/Minigames/Core/MinigamesHandler.pwn | 2 -- 3 files changed, 8 deletions(-) diff --git a/pawn/Interface/timers.pwn b/pawn/Interface/timers.pwn index bb6d8bf26..28f55f5f8 100644 --- a/pawn/Interface/timers.pwn +++ b/pawn/Interface/timers.pwn @@ -188,14 +188,10 @@ class DeprecatedTimerRuntime { }; StartTimers() { -#if Feature::DisableHay == 0 SetTimer("QuickTimer", 100, 1); -#endif } forward QuickTimer(); public QuickTimer() { -#if Feature::DisableHay == 0 CHay__Process(); -#endif } diff --git a/pawn/Resources/Callbacks/Others/OnDialogResponse.pwn b/pawn/Resources/Callbacks/Others/OnDialogResponse.pwn index f0b1a18af..cdebe812d 100644 --- a/pawn/Resources/Callbacks/Others/OnDialogResponse.pwn +++ b/pawn/Resources/Callbacks/Others/OnDialogResponse.pwn @@ -156,9 +156,7 @@ deprecated_OnDialogResponse(playerid, dialogid, response, listitem, inputtext[]) case 6: CLyse__MenuActivate(playerid); case 7: CWWTW__MenuActivate(playerid); case 8: rwMenuActivate(playerid); -#if Feature::DisableHay == 0 case 9: hayMenuActivate(playerid); -#endif case 10: OnWaterFightCmdText(playerid); } #endif diff --git a/pawn/Resources/Minigames/Core/MinigamesHandler.pwn b/pawn/Resources/Minigames/Core/MinigamesHandler.pwn index 130618887..c8104d30e 100644 --- a/pawn/Resources/Minigames/Core/MinigamesHandler.pwn +++ b/pawn/Resources/Minigames/Core/MinigamesHandler.pwn @@ -384,10 +384,8 @@ IsPlayerInMinigame(playerId) { if (rwIsPlayerSignedUp(playerId) && rwGetState() > 1) return 1; -#if Feature::DisableHay == 0 if (hayHasPlayerSignedUp(playerId) && hayGetState() > 1) return 1; -#endif if (CLyse__GetPlayerState(playerId) > 1) return 1;