From: bones_was_here <bones_was_here@xa.org.au>
Date: Sun, 2 May 2021 14:08:12 +0000 (+1000)
Subject: sv_maxidle: remove disabled announcer countdown
X-Git-Tag: xonotic-v0.8.5~419^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b90bfe414e0d2c3973d412c5540363b81ae8dc36;p=xonotic%2Fxonotic-data.pk3dir.git

sv_maxidle: remove disabled announcer countdown
---

diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc
index f30dade81..94e4a250d 100644
--- a/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@ -149,17 +149,6 @@
     MSG_ANNCE_NOTIF(NUM_GAMESTART_9,            N___NEVER, "9",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
     MSG_ANNCE_NOTIF(NUM_GAMESTART_10,           N___NEVER, "10",                CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
 
-    MSG_ANNCE_NOTIF(NUM_IDLE_1,                 N___NEVER, "1",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-    MSG_ANNCE_NOTIF(NUM_IDLE_2,                 N___NEVER, "2",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-    MSG_ANNCE_NOTIF(NUM_IDLE_3,                 N___NEVER, "3",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-    MSG_ANNCE_NOTIF(NUM_IDLE_4,                 N___NEVER, "4",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-    MSG_ANNCE_NOTIF(NUM_IDLE_5,                 N___NEVER, "5",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-    MSG_ANNCE_NOTIF(NUM_IDLE_6,                 N___NEVER, "6",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-    MSG_ANNCE_NOTIF(NUM_IDLE_7,                 N___NEVER, "7",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-    MSG_ANNCE_NOTIF(NUM_IDLE_8,                 N___NEVER, "8",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-    MSG_ANNCE_NOTIF(NUM_IDLE_9,                 N___NEVER, "9",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-    MSG_ANNCE_NOTIF(NUM_IDLE_10,                N___NEVER, "10",                CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-
     MSG_ANNCE_NOTIF(NUM_KILL_1,                 N___NEVER, "1",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
     MSG_ANNCE_NOTIF(NUM_KILL_2,                 N___NEVER, "2",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
     MSG_ANNCE_NOTIF(NUM_KILL_3,                 N___NEVER, "3",                 CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 964e89520..658c3439f 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -1710,23 +1710,6 @@ Notification Announcer_PickNumber(int type, int num)
 			}
 			break;
 		}
-		case CNT_IDLE:
-		{
-			switch(num)
-			{
-				case 10: return ANNCE_NUM_IDLE_10;
-				case 9:  return ANNCE_NUM_IDLE_9;
-				case 8:  return ANNCE_NUM_IDLE_8;
-				case 7:  return ANNCE_NUM_IDLE_7;
-				case 6:  return ANNCE_NUM_IDLE_6;
-				case 5:  return ANNCE_NUM_IDLE_5;
-				case 4:  return ANNCE_NUM_IDLE_4;
-				case 3:  return ANNCE_NUM_IDLE_3;
-				case 2:  return ANNCE_NUM_IDLE_2;
-				case 1:  return ANNCE_NUM_IDLE_1;
-			}
-			break;
-		}
 		case CNT_KILL:
 		{
 			switch(num)
diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index bf63bbb91..63fd27839 100644
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -210,7 +210,7 @@ vector animfixfps(entity e, vector a, vector b);
 #ifdef GAMEQC
 const int CNT_NORMAL = 1;
 const int CNT_GAMESTART = 2;
-const int CNT_IDLE = 3;
+//const int CNT_IDLE = 3;
 const int CNT_KILL = 4;
 const int CNT_RESPAWN = 5;
 const int CNT_ROUNDSTART = 6;