X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Fsounds%2Fsound.qh;h=7225cef825ccb4ef2df20c0f4911542a88f37f2e;hb=985f81ea5425d2e3d2382a6b13397976ca15783a;hp=dfc80e390a6696ab111f881e693158766021cba6;hpb=0cdb1b7f5c95d832b0d9269fed155bcb01870cf3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/sounds/sound.qh b/qcsrc/common/sounds/sound.qh
index dfc80e390..7225cef82 100644
--- a/qcsrc/common/sounds/sound.qh
+++ b/qcsrc/common/sounds/sound.qh
@@ -1,22 +1,97 @@
 #ifndef SOUND_H
 #define SOUND_H
 
+// negative = SVQC autochannels
+// positive = one per entity
+
+const int CH_INFO = 0;
+const int CH_WEAPON_A = -1;
+const int CH_WEAPON_B = -1;
+const int CH_WEAPON_SINGLE = 1;
+const int CH_VOICE = -2;
+// const int CH_VOICE_SINGLE = 2;
+const int CH_TRIGGER = -3;
+const int CH_TRIGGER_SINGLE = 3;
+const int CH_SHOTS = -4;
+const int CH_SHOTS_SINGLE = 4;
+// const int CH_TUBA = -5;
+const int CH_TUBA_SINGLE = 5;
+const int CH_PAIN = -6;
+const int CH_PAIN_SINGLE = 6;
+const int CH_PLAYER = -7;
+const int CH_PLAYER_SINGLE = 7;
+// const int CH_BGM_SINGLE = -8;
+const int CH_BGM_SINGLE = 8;
+const int CH_AMBIENT = -9;
+// const int CH_AMBIENT_SINGLE = 9;
+
+const float ATTEN_NONE = 0;
+const float ATTEN_MIN = 0.015625;
+const float ATTEN_NORM = 0.5;
+const float ATTEN_LARGE = 1;
+const float ATTEN_IDLE = 2;
+const float ATTEN_STATIC = 3;
+const float ATTEN_MAX = 3.984375;
+
+const float VOL_BASE = 0.7;
+const float VOL_BASEVOICE = 1.0;
+
 // Play all sounds via sound7, for access to the extra channels.
 // Otherwise, channels 8 to 15 would be blocked for a weird QW feature.
 #ifdef SVQC
 	#define _sound(e, c, s, v, a) \
-		do \
+		MACRO_BEGIN \
 		{ \
 			entity __e = e; \
-			if (!sound_allowed(MSG_BROADCAST, __e)) break; \
-			sound7(__e, c, s, v, a, 0, 0); \
-		} \
-		while (0)
+			if (sound_allowed(MSG_BROADCAST, __e)) \
+				sound7(__e, c, s, v, a, 0, 0); \
+		} MACRO_END
 #else
 	#define _sound(e, c, s, v, a) sound7(e, c, s, v, a, 0, 0)
 #endif
 #define sound(e, c, s, v, a) _sound(e, c, Sound_fixpath(s), v, a)
 
+/**
+ * because sound7 didn't have origin
+ *
+ * @param e sound owner
+ * @param o sound origin
+ * @param chan sound channel
+ * @param samp sound filename
+ * @param vol sound volume
+ * @param atten sound attenuation
+ * @param speed
+ * @param sf
+ */
+#define sound8(e, o, chan, samp, vol, atten, speed, sf) \
+	MACRO_BEGIN \
+	{ \
+		entity __e; \
+		int __chan = chan; \
+		string __samp = samp; \
+		bool auto = false; \
+		if (__chan > 0) __e = e; \
+		else \
+		{ \
+			auto = true; \
+			__chan = fabs(__chan); \
+			entity tmp = __e = new(csqc_autochannel); \
+			tmp.think = SUB_Remove_self; \
+			tmp.nextthink = time + soundlength(__samp); \
+		} \
+		vector old_origin = __e.origin; \
+		vector old_mins = __e.mins; \
+		vector old_maxs = __e.maxs; \
+		setorigin(__e, o); \
+		setsize(__e, '0 0 0', '0 0 0'); \
+		sound7(__e, __chan, __samp, vol, atten, speed, sf); \
+		if (!auto) \
+		{ \
+			setorigin(__e, old_origin); \
+			setsize(__e, old_mins, old_maxs); \
+		} \
+	} MACRO_END
+
 CLASS(Sound, Object)
 	ATTRIB(Sound, m_id, int, 0)
 	ATTRIB(Sound, sound_str, string(), func_null)
@@ -28,30 +103,28 @@ CLASS(Sound, Object)
 	#define Sound_fixpath(this) _Sound_fixpath((this).sound_str())
 	string _Sound_fixpath(string base)
 	{
-        if (base == "") return string_null;
-        #define extensions(x) \
-            x(wav) \
-            x(ogg) \
-            x(flac) \
-            /**/
-        string full, relative;
-        #define tryext(ext) { if (fexists(full = strcat("sound/", relative = strcat(base, "." #ext)))) break; }
-        do
-        {
-            extensions(tryext);
-#undef tryext
-#undef extensions
-            LOG_WARNINGF("Missing sound: \"%s\"\n", full);
-            return string_null;
-        }
-        while (0);
-        return relative;
+		if (base == "") return string_null;
+#ifdef SVQC
+		return strcat(base, ".wav");  // let the client engine decide
+#else
+		#define extensions(x) \
+			x(wav) \
+			x(ogg) \
+			x(flac) \
+			/**/
+		#define tryext(ext) { string s = strcat(base, "." #ext); if (fexists(strcat("sound/", s))) return s; }
+		extensions(tryext);
+		LOG_WARNINGF("Missing sound: \"%s\"\n", strcat("sound/", base));
+		#undef tryext
+		#undef extensions
+		return string_null;
+#endif
 	}
 	METHOD(Sound, sound_precache, void(entity this))
 	{
 		string s = Sound_fixpath(this);
 		if (!s) return;
-		LOG_TRACEF("precache_sound(\"%s\")\n", s);
+		LOG_DEBUGF("precache_sound(\"%s\")\n", s);
 		precache_sound(s);
 	}
 ENDCLASS(Sound)