From 3a0c0dffe1aed299bfa6fc7b49faeab49b6138f9 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 3 Mar 2021 14:09:15 +0100 Subject: [PATCH] Stop player powerup sounds when disconnecting --- qcsrc/server/client.qc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 6fc37b13e..74592b62c 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -1201,6 +1201,8 @@ Called when a client disconnects from the server ============= */ .entity chatbubbleentity; +void player_powerups_remove_all(entity this); + void ClientDisconnect(entity this) { assert(IS_CLIENT(this), return); @@ -1253,6 +1255,8 @@ void ClientDisconnect(entity this) ReadyCount(); if (vote_called && IS_REAL_CLIENT(this)) VoteCount(false); + player_powerups_remove_all(this); // stop powerup sound + ONREMOVE(this); } @@ -1449,7 +1453,8 @@ void player_powerups_remove_all(entity this) { if (this.items & (ITEM_Strength.m_itemid | ITEM_Shield.m_itemid | IT_SUPERWEAPON)) { - if (time > game_starttime + 1) + // don't play the poweroff sound when the game restarts or the player disconnects + if (time > game_starttime + 1 && IS_CLIENT(this)) sound(this, CH_INFO, SND_POWEROFF, VOL_BASE, ATTEN_NORM); stopsound(this, CH_TRIGGER_SINGLE); // get rid of the pickup sound this.items &= ~ITEM_Strength.m_itemid; -- 2.39.2