From: Mario <mario.mario@y7mail.com>
Date: Thu, 4 Jun 2020 22:36:12 +0000 (+1000)
Subject: Optionally play a respawning sound twice before an item actually respawns (enabled... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c5d2c85f158bf156d3b212b64ad41a1e0fc2e01;p=xonotic%2Fxonotic-data.pk3dir.git

Optionally play a respawning sound twice before an item actually respawns (enabled by default)
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 37cb77a7a..a0a97b148 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -558,6 +558,12 @@ void Item_RespawnThink(entity this)
 
 	if(time >= this.wait)
 		Item_Respawn(this);
+	else if(autocvar_g_items_respawnpulses)
+	{
+		float finished = this.wait - time;
+		if(finished < 3 && finished >= 1 && floor(finished - frametime) != floor(finished)) // at least 2 seconds remain until the item will respawn
+			sound(this, CH_TRIGGER, SND_ITEMRESPAWNCOUNTDOWN, VOL_BASE, ATTEN_NORM);
+	}
 }
 
 void Item_ScheduleRespawnIn(entity e, float t)
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 99077dcfe..3ee055be1 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -182,6 +182,7 @@ bool autocvar_g_nodepthtestplayers;
 bool autocvar_g_norecoil;
 float autocvar_g_items_mindist;
 float autocvar_g_items_maxdist;
+bool autocvar_g_items_respawnpulses = true;
 int autocvar_g_pickup_items;
 float autocvar_g_player_alpha;
 float autocvar_g_player_brightness;
diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index c7b63f536..be773c5ea 100644
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -225,6 +225,7 @@ set g_maplist_ignore_sizes 0 "when 1, all maps are shown in the map list regardl
 set g_maplist_sizes_count_maxplayers 1 "check the player limit when getting the player count so forced spectators don't affect the size restrictions"
 set g_maplist_sizes_count_bots 1 "include the number of bots currently in the server when counting the number of players for size restrictions"
 
+set g_items_respawnpulses 1 "play a pulsing sound effect when items are about to respawn"
 set g_items_mindist 4000 "starting distance for the fading of items"
 set g_items_maxdist 4500 "maximum distance at which an item can be viewed, after which it will be invisible"