From a7692c7371516b3dba2ea6ec4072b2f72da0b572 Mon Sep 17 00:00:00 2001 From: Obuss Date: Fri, 10 Aug 2018 20:51:58 -0500 Subject: [PATCH] Switch panel priorities between FunMode and FNF --- FailNadeFriday/scripting/FailNadeFriday.sp | 5 +++++ FunMode/scripting/FunMode.sp | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FailNadeFriday/scripting/FailNadeFriday.sp b/FailNadeFriday/scripting/FailNadeFriday.sp index b95b677d..aaa94acd 100644 --- a/FailNadeFriday/scripting/FailNadeFriday.sp +++ b/FailNadeFriday/scripting/FailNadeFriday.sp @@ -38,6 +38,11 @@ public void OnClientPutInServer(int client) if (!IsItFailnadeTime()) return; + MenuSource iOpenMenu = GetClientMenu(client); + + if (iOpenMenu != MenuSource_None && iOpenMenu == MenuSource_RawPanel) //probably FunMode + return; + Panel hNotifyPanel = new Panel(GetMenuStyleHandle(MenuStyle_Radio)); hNotifyPanel.SetTitle("*** It's Fail Nade Friday! ***"); hNotifyPanel.DrawItem("", ITEMDRAW_SPACER); diff --git a/FunMode/scripting/FunMode.sp b/FunMode/scripting/FunMode.sp index eb70e0d1..2e662ea0 100644 --- a/FunMode/scripting/FunMode.sp +++ b/FunMode/scripting/FunMode.sp @@ -188,11 +188,6 @@ public void OnClientPutInServer(int client) if (g_bInWarmup) return; - MenuSource iOpenMenu = GetClientMenu(client); - - if (iOpenMenu != MenuSource_None && iOpenMenu == MenuSource_RawPanel) //probably failnadefriday - return; - Panel hNotifyPanel = new Panel(GetMenuStyleHandle(MenuStyle_Radio)); hNotifyPanel.DrawItem("Freezenades vs. Throwing Knives Mode is enabled on this map.", ITEMDRAW_RAWLINE); hNotifyPanel.DrawItem("", ITEMDRAW_SPACER);