From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 28 Feb 2016 04:47:34 +0000 (+1100)
Subject: Sounds: revert to engine networking
X-Git-Tag: xonotic-v0.8.2~1173
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aed8f0cb5c4241a5f38ab5d7146e17a0fb6c01d7;p=xonotic%2Fxonotic-data.pk3dir.git

Sounds: revert to engine networking
---

diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc
index 1d634f6e5..f13b23104 100644
--- a/qcsrc/common/effects/qc/globalsound.qc
+++ b/qcsrc/common/effects/qc/globalsound.qc
@@ -12,7 +12,11 @@
 	REGISTER_NET_TEMP(globalsound)
 	REGISTER_NET_TEMP(playersound)
 
+	string GlobalSound_sample(string pair, float r);
+
 	#ifdef SVQC
+		/** Use new sound handling. TODO: use when sounds play correctly on clients */
+		bool autocvar_g_debug_globalsounds = false;
 		/**
 		 * @param from the source entity, its position is sent
 		 * @param gs the global sound def
@@ -22,6 +26,18 @@
 		{
 			assert(IS_PLAYER(from), eprint(from));
 			if (channel == MSG_ONE && !IS_REAL_CLIENT(msg_entity)) return;
+			if (!autocvar_g_debug_globalsounds) {
+				string sample = GlobalSound_sample(gs.m_globalsoundstr, r);
+				switch (channel) {
+					case MSG_ONE:
+						soundto(channel, from, chan, sample, vol, atten);
+						break;
+					case MSG_ALL:
+						_sound(from, chan, sample, vol, atten);
+						break;
+				}
+				return;
+			}
 			WriteHeader(channel, globalsound);
 			WriteByte(channel, gs.m_id);
 			WriteByte(channel, r * 255);
@@ -45,6 +61,20 @@
 		{
 			assert(IS_PLAYER(from), eprint(from));
 			if (channel == MSG_ONE && !IS_REAL_CLIENT(msg_entity)) return;
+			if (!autocvar_g_debug_globalsounds) {
+				UpdatePlayerSounds(from);
+				string s = from.(ps.m_playersoundfld);
+				string sample = GlobalSound_sample(s, r);
+				switch (channel) {
+					case MSG_ONE:
+						soundto(channel, from, chan, sample, vol, atten);
+						break;
+					case MSG_ALL:
+						_sound(from, chan, sample, vol, atten);
+						break;
+				}
+				return;
+			}
 			WriteHeader(channel, playersound);
 			WriteByte(channel, ps.m_id);
 			WriteByte(channel, r * 255);
@@ -60,8 +90,6 @@
 		}
 	#endif
 
-	string GlobalSound_sample(string pair, float r);
-
 	#ifdef CSQC
 
 		NET_HANDLE(globalsound, bool isnew)
@@ -220,7 +248,7 @@
 		fclose(fh);
 	}
 
-	#ifdef CSQC
+	//#ifdef CSQC
 
 		.string GetPlayerSoundSampleField(string type)
 		{
@@ -229,14 +257,14 @@
 
 		void ClearPlayerSounds(entity this)
 		{
-			FOREACH(PlayerSounds, true, LAMBDA(
+			FOREACH(PlayerSounds, true, {
 				.string fld = it.m_playersoundfld;
 				if (this.(fld))
-	{
-		strunzone(this.(fld));
-		this.(fld) = string_null;
-	}
-				                              ));
+				{
+					strunzone(this.(fld));
+					this.(fld) = string_null;
+				}
+			});
 		}
 
 		bool LoadPlayerSounds(entity this, string f, bool strict)
@@ -290,7 +318,7 @@
 			LoadPlayerSounds(this, get_model_datafilename(this.model, 0, "sounds"), true);
 		}
 
-	#endif
+	//#endif
 
 	#ifdef SVQC
 
diff --git a/qcsrc/common/effects/qc/globalsound.qh b/qcsrc/common/effects/qc/globalsound.qh
index 1c2aa6461..22e04e94a 100644
--- a/qcsrc/common/effects/qc/globalsound.qh
+++ b/qcsrc/common/effects/qc/globalsound.qh
@@ -108,13 +108,13 @@ REGISTER_GLOBALSOUND(FALL_METAL, "misc/metalhitground 4")
 
 bool GetPlayerSoundSampleField_notFound;
 void PrecachePlayerSounds(string f);
-#ifdef CSQC
+//#ifdef CSQC
 	.string GetVoiceMessageSampleField(string type);
 	.string GetPlayerSoundSampleField(string type);
 	void ClearPlayerSounds(entity this);
 	float LoadPlayerSounds(entity this, string f, bool strict);
 	void UpdatePlayerSounds(entity this);
-#endif
+//#endif
 
 #ifdef SVQC