X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Feffects%2Fqc%2Fglobalsound.qc;h=06b8baa1a325999039f6ebe76da88534d82f63c2;hp=9fc46ff67537b6cbf42d9a33e03e467feda2772b;hb=8e5d3750fe6c2938222b1a6547b0d26b7a1ede60;hpb=ae458cf44e1264534a20514f2f451c3d06ff135b

diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc
index 9fc46ff675..06b8baa1a3 100644
--- a/qcsrc/common/effects/qc/globalsound.qc
+++ b/qcsrc/common/effects/qc/globalsound.qc
@@ -17,7 +17,7 @@
 		 * @param gs the global sound def
 		 * @param r a random number in 0..1
 		 */
-		void globalsound(int channel, entity from, entity gs, float r, int chan, float _vol, float _atten)
+		void globalsound(int channel, entity from, entity gs, float r, int chan, float _vol, float _atten, float _pitch)
 		{
 			//assert(IS_PLAYER(from), eprint(from));
 			if (channel == MSG_ONE && !IS_REAL_CLIENT(msg_entity)) return;
@@ -25,14 +25,16 @@
 				string sample = GlobalSound_sample(gs.m_globalsoundstr, r);
 				switch (channel) {
 					case MSG_ONE:
-						soundto(channel, from, chan, sample, _vol, _atten);
+						soundto(channel, from, chan, sample, _vol, _atten, _pitch);
 						break;
 					case MSG_ALL:
-						_sound(from, chan, sample, _vol, _atten);
+						if(sound_allowed(MSG_BROADCAST, from))
+							sound7(from, chan, sample, _vol, _atten, _pitch, 0);
 						break;
 				}
 				return;
 			}
+			// FIXME: pitch not implemented
 			WriteHeader(channel, globalsound);
 			WriteByte(channel, gs.m_id);
 			WriteByte(channel, r * 255);
@@ -50,7 +52,7 @@
 		* @param ps the player sound def
 		* @param r a random number in 0..1
 		*/
-		void playersound(int channel, entity from, entity ps, float r, int chan, float _vol, float _atten)
+		void playersound(int channel, entity from, entity ps, float r, int chan, float _vol, float _atten, float _pitch)
 		{
 			//assert(IS_PLAYER(from), eprint(from));
 			if (channel == MSG_ONE && !IS_REAL_CLIENT(msg_entity)) return;
@@ -60,14 +62,16 @@
 				string sample = GlobalSound_sample(s, r);
 				switch (channel) {
 					case MSG_ONE:
-						soundto(channel, from, chan, sample, _vol, _atten);
+						soundto(channel, from, chan, sample, _vol, _atten, _pitch);
 						break;
 					case MSG_ALL:
-						_sound(from, chan, sample, _vol, _atten);
+						if(sound_allowed(MSG_BROADCAST, from))
+							sound7(from, chan, sample, _vol, _atten, _pitch, 0);
 						break;
 				}
 				return;
 			}
+			// FIXME: pitch not implemented
 			WriteHeader(channel, playersound);
 			WriteByte(channel, ps.m_id);
 			WriteByte(channel, r * 255);
@@ -85,7 +89,7 @@
 
 		NET_HANDLE(globalsound, bool isnew)
 		{
-			entity gs = GlobalSounds_from(ReadByte());
+			entity gs = REGISTRY_GET(GlobalSounds, ReadByte());
 			float r = ReadByte() / 255;
 			string sample = GlobalSound_sample(gs.m_globalsoundstr, r);
 			int who = ReadByte();
@@ -112,7 +116,7 @@
 
 		NET_HANDLE(playersound, bool isnew)
 		{
-			entity ps = PlayerSounds_from(ReadByte());
+			entity ps = REGISTRY_GET(PlayerSounds, ReadByte());
 			float r = ReadByte() / 255;
 			int who = ReadByte();
 			entity e = entcs_receiver(who - 1);
@@ -155,6 +159,18 @@
 		return sample;
 	}
 
+	float GlobalSound_pitch(float _pitch)
+	{
+		// customizable gradient function that crosses (0,a), (c,1) and asymptotically approaches b
+		float a = 1.5; // max pitch
+		float b = 0.75; // min pitch
+		float c = 100; // standard pitch (scale * 100)
+		float d = _pitch;
+		float pitch_shift = (b*d*(a-1) + a*c*(1-b)) / (d*(a-1) + c*(1-b));
+
+		return pitch_shift * 100;
+	}
+
 	void PrecacheGlobalSound(string sample)
 	{
 		int n;
@@ -288,9 +304,9 @@
 			LoadPlayerSounds(this, "sound/player/default.sounds", true);
 			if (this.model == "null"
 			#ifdef SVQC
-			    && autocvar_g_debug_globalsounds
+				&& autocvar_g_debug_globalsounds
 			#endif
-			 ) return;
+			) return;
 			if (autocvar_g_debug_defaultsounds) return;
 			if (LoadPlayerSounds(this, get_model_datafilename(this.model, this.skin, "sounds"), false)) return;
 			LoadPlayerSounds(this, get_model_datafilename(this.model, 0, "sounds"), true);
@@ -305,6 +321,8 @@
 			if (gs == NULL && ps == NULL && sample == "") return;
 			if(this.classname == "body") return;
 			float r = random();
+			float myscale = ((this.scale) ? this.scale : 1); // safety net
+			float thepitch = ((myscale == 1) ? 0 : GlobalSound_pitch(myscale * 100));
 			if (sample != "") sample = GlobalSound_sample(sample, r);
 			switch (voicetype)
 			{
@@ -318,18 +336,18 @@
 						if (IS_REAL_CLIENT(msg_entity))
 						{
 							float atten = (CS(msg_entity).cvar_cl_voice_directional == 1) ? ATTEN_MIN : ATTEN_NONE;
-							if (gs) globalsound(MSG_ONE, this, gs, r, chan, vol, atten);
-							else if (ps) playersound(MSG_ONE, this, ps, r, chan, vol, atten);
-							else soundto(MSG_ONE, this, chan, sample, vol, atten);
+							if (gs) globalsound(MSG_ONE, this, gs, r, chan, vol, atten, thepitch);
+							else if (ps) playersound(MSG_ONE, this, ps, r, chan, vol, atten, thepitch);
+							else soundto(MSG_ONE, this, chan, sample, vol, atten, thepitch);
 						}
 					}
 					if (voicetype == VOICETYPE_LASTATTACKER_ONLY) break;
 					msg_entity = this;
 					if (IS_REAL_CLIENT(msg_entity))
 					{
-						if (gs) globalsound(MSG_ONE, this, gs, r, chan, VOL_BASE, ATTEN_NONE);
-						else if (ps) playersound(MSG_ONE, this, ps, r, chan, VOL_BASE, ATTEN_NONE);
-						else soundto(MSG_ONE, this, chan, sample, VOL_BASE, ATTEN_NONE);
+						if (gs) globalsound(MSG_ONE, this, gs, r, chan, VOL_BASE, ATTEN_NONE, thepitch);
+						else if (ps) playersound(MSG_ONE, this, ps, r, chan, VOL_BASE, ATTEN_NONE, thepitch);
+						else soundto(MSG_ONE, this, chan, sample, VOL_BASE, ATTEN_NONE, thepitch);
 					}
 					break;
 				}
@@ -338,9 +356,9 @@
 					#define X() \
 						MACRO_BEGIN \
 							float atten = (CS(msg_entity).cvar_cl_voice_directional == 1) ? ATTEN_MIN : ATTEN_NONE; \
-							if (gs) globalsound(MSG_ONE, this, gs, r, chan, vol, atten); \
-							else if (ps) playersound(MSG_ONE, this, ps, r, chan, vol, atten); \
-							else soundto(MSG_ONE, this, chan, sample, vol, atten); \
+							if (gs) globalsound(MSG_ONE, this, gs, r, chan, vol, atten, thepitch); \
+							else if (ps) playersound(MSG_ONE, this, ps, r, chan, vol, atten, thepitch); \
+							else soundto(MSG_ONE, this, chan, sample, vol, atten, thepitch); \
 						MACRO_END
 
 					if (fake) { msg_entity = this; X(); }
@@ -351,30 +369,35 @@
 							X();
 						});
 					}
-		#undef X
+					#undef X
 					break;
 				}
 				case VOICETYPE_AUTOTAUNT:
 				case VOICETYPE_TAUNT:
 				{
-					if (voicetype == VOICETYPE_AUTOTAUNT) if (!sv_autotaunt) { break; }else {}
-					else if (IS_PLAYER(this) && !IS_DEAD(this)) animdecide_setaction(this, ANIMACTION_TAUNT,
-							true);
+					if (voicetype == VOICETYPE_AUTOTAUNT)
+					{
+						if (!sv_autotaunt) break;
+					}
+					else if (IS_PLAYER(this) && !IS_DEAD(this))
+						animdecide_setaction(this, ANIMACTION_TAUNT, true);
+
 					if (!sv_taunt) break;
 					if (autocvar_sv_gentle) break;
 					float tauntrand = 0;
 					if (voicetype == VOICETYPE_AUTOTAUNT) tauntrand = random();
+
 					#define X() \
 						MACRO_BEGIN \
 							if (voicetype != VOICETYPE_AUTOTAUNT || tauntrand < CS(msg_entity).cvar_cl_autotaunt) \
 							{ \
 								float atten = (CS(msg_entity).cvar_cl_voice_directional >= 1) \
-								    ? bound(ATTEN_MIN, CS(msg_entity).cvar_cl_voice_directional_taunt_attenuation, \
+									? bound(ATTEN_MIN, CS(msg_entity).cvar_cl_voice_directional_taunt_attenuation, \
 									ATTEN_MAX) \
 									: ATTEN_NONE; \
-								if (gs) globalsound(MSG_ONE, this, gs, r, chan, vol, atten); \
-								else if (ps) playersound(MSG_ONE, this, ps, r, chan, vol, atten); \
-								else soundto(MSG_ONE, this, chan, sample, vol, atten); \
+								if (gs) globalsound(MSG_ONE, this, gs, r, chan, vol, atten, thepitch); \
+								else if (ps) playersound(MSG_ONE, this, ps, r, chan, vol, atten, thepitch); \
+								else soundto(MSG_ONE, this, chan, sample, vol, atten, thepitch); \
 							} \
 						MACRO_END
 					if (fake)
@@ -389,7 +412,7 @@
 							X();
 						});
 					}
-		#undef X
+					#undef X
 					break;
 				}
 				case VOICETYPE_PLAYERSOUND:
@@ -397,15 +420,15 @@
 					msg_entity = this;
 					if (fake)
 					{
-						if (gs) globalsound(MSG_ONE, this, gs, r, chan, vol, ATTEN_NORM);
-						else if (ps) playersound(MSG_ONE, this, ps, r, chan, vol, ATTEN_NORM);
-						else soundto(MSG_ONE, this, chan, sample, vol, ATTEN_NORM);
+						if (gs) globalsound(MSG_ONE, this, gs, r, chan, vol, ATTEN_NORM, thepitch);
+						else if (ps) playersound(MSG_ONE, this, ps, r, chan, vol, ATTEN_NORM, thepitch);
+						else soundto(MSG_ONE, this, chan, sample, vol, ATTEN_NORM, thepitch);
 					}
 					else
 					{
-						if (gs) globalsound(MSG_ALL, this, gs, r, chan, vol, ATTEN_NORM);
-						else if (ps) playersound(MSG_ALL, this, ps, r, chan, vol, ATTEN_NORM);
-						else _sound(this, chan, sample, vol, ATTEN_NORM);
+						if (gs) globalsound(MSG_ALL, this, gs, r, chan, vol, ATTEN_NORM, thepitch);
+						else if (ps) playersound(MSG_ALL, this, ps, r, chan, vol, ATTEN_NORM, thepitch);
+						else if (sound_allowed(MSG_BROADCAST, this)) sound7(this, chan, sample, vol, ATTEN_NORM, thepitch, 0);
 					}
 					break;
 				}