From c5fbaafd980dc31484c4cb5176ab395941f92e90 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 20 Oct 2021 01:20:37 +0200
Subject: [PATCH] Remove deprecated EV_CHAT_VOX. Update game-mode zones to be
 NSBrushTrigger based instead of CBaseTrigger.

---
 src/client/game_event.qc          | 3 ---
 src/server/client.qc              | 4 ++--
 src/server/func_bomb_target.qc    | 2 +-
 src/server/func_buyzone.qc        | 4 ++--
 src/server/func_escapezone.qc     | 2 +-
 src/server/func_hostage_rescue.qc | 4 ++--
 src/server/func_vip_safetyzone.qc | 2 +-
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/client/game_event.qc b/src/client/game_event.qc
index e86a62a..37d101d 100644
--- a/src/client/game_event.qc
+++ b/src/client/game_event.qc
@@ -114,9 +114,6 @@ switch (fHeader) {
 
 		CSQC_Parse_Print(sprintf("^xF80[TEAM] ^7%s^7^xF80: %s", strName2, sMessage2), PRINT_CHAT);
 		break;
-	case EV_CHAT_VOX:
-		Vox_Play(readstring());
-		break;
 	case EV_VIEWMODEL:
 		View_PlayAnimation(readbyte());
 		break;
diff --git a/src/server/client.qc b/src/server/client.qc
index d9b72fa..b5221a1 100644
--- a/src/server/client.qc
+++ b/src/server/client.qc
@@ -55,9 +55,9 @@ Game_ParseClientCommand(string cmd)
 		string timestring;
 		float timeleft;
 		timeleft = cvar("mp_timelimit") - (time / 60);
-		timestring = Vox_TimeToString(timeleft);
+		timestring = Util_TimeToString(timeleft);
 		msg = sprintf("we have %s minutes remaining", timestring);
-		Vox_Singlecast(self, msg);
+		bprint(PRINT_CHAT, msg);
 		return;
 	}
 
diff --git a/src/server/func_bomb_target.qc b/src/server/func_bomb_target.qc
index 278ddf7..43dd7f4 100644
--- a/src/server/func_bomb_target.qc
+++ b/src/server/func_bomb_target.qc
@@ -27,7 +27,7 @@ Used in the bomb defusal mode (de_* maps).
 Once the bomb explodes inside this volume, it'll trigger its targets.
 */
 
-class func_bomb_target:CBaseTrigger
+class func_bomb_target:NSBrushTrigger
 {
 	void(void) func_bomb_target;
 
diff --git a/src/server/func_buyzone.qc b/src/server/func_buyzone.qc
index 17b6196..088a3c5 100644
--- a/src/server/func_buyzone.qc
+++ b/src/server/func_buyzone.qc
@@ -40,7 +40,7 @@ Choices for 'team' include:
     2 = Counter-Terrorist
 */
 
-class func_buyzone:CBaseTrigger
+class func_buyzone:NSBrushTrigger
 {
 	void(void) func_buyzone;
 
@@ -68,6 +68,6 @@ func_buyzone::Respawn(void)
 void
 func_buyzone::func_buyzone(void)
 {
-	CBaseTrigger::CBaseTrigger();
+	NSBrushTrigger::NSBrushTrigger();
 	InitBrushTrigger();
 }
diff --git a/src/server/func_escapezone.qc b/src/server/func_escapezone.qc
index 53a7d92..96c69d6 100644
--- a/src/server/func_escapezone.qc
+++ b/src/server/func_escapezone.qc
@@ -26,7 +26,7 @@ Terrorist escape zone.
 Used in the Escape mode (es_* maps).
 */
 
-class func_escapezone:CBaseTrigger
+class func_escapezone:NSBrushTrigger
 {
 	virtual void(void) Respawn;
 }; 
diff --git a/src/server/func_hostage_rescue.qc b/src/server/func_hostage_rescue.qc
index 70b56ef..5299fd0 100644
--- a/src/server/func_hostage_rescue.qc
+++ b/src/server/func_hostage_rescue.qc
@@ -28,7 +28,7 @@ If neither a func_hostage_rescue or a info_hostage_rescue is placed,
 zones will be placed in Counter-Terrorist player spawn nodes automatically.
 */
 
-class func_hostage_rescue:CBaseTrigger
+class func_hostage_rescue:NSBrushTrigger
 {
 	void(void) func_hostage_rescue;
 
@@ -81,6 +81,6 @@ func_hostage_rescue::Respawn(void)
 void
 func_hostage_rescue::func_hostage_rescue(void)
 {
-	CBaseTrigger::CBaseTrigger();
+	NSBrushTrigger::NSBrushTrigger();
 	InitBrushTrigger();
 }
diff --git a/src/server/func_vip_safetyzone.qc b/src/server/func_vip_safetyzone.qc
index a50b644..4dd96e2 100644
--- a/src/server/func_vip_safetyzone.qc
+++ b/src/server/func_vip_safetyzone.qc
@@ -26,7 +26,7 @@ VIP safety zone.
 Used in the assassination mode (as_* maps).
 */
 
-class func_vip_safetyzone:CBaseTrigger
+class func_vip_safetyzone:NSBrushTrigger
 {
 	virtual void(void) Respawn;
 };