From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 28 Feb 2013 09:46:44 +0000 (+0000)
Subject: restore flags feature in csqc sound7 builtin, so that mods can use
X-Git-Tag: xonotic-v0.8.0~96^2~121
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b3a534588ed7c76a3ed7dde8140c083af642f4dc;p=xonotic%2Fdarkplaces.git

restore flags feature in csqc sound7 builtin, so that mods can use
CHANNELFLAG_FORCELOOP and others as before


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11918 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 67a496b9..e1c6ff0d 100644
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -175,9 +175,7 @@ static void VM_CL_sound (prvm_prog_t *prog)
 	float				attenuation;
 	float pitchchange;
 	float				startposition;
-	/*
 	int flags;
-	*/
 	vec3_t				org;
 
 	VM_SAFEPARMCOUNTRANGE(5, 7, VM_CL_sound);
@@ -204,14 +202,11 @@ static void VM_CL_sound (prvm_prog_t *prog)
 		pitchchange = 0;
 	else
 		pitchchange = PRVM_G_FLOAT(OFS_PARM5);
-	// ignoring prog->argc < 7 for now (no flags supported yet)
 
-	/*
 	if (prog->argc < 7)
 		flags = 0;
 	else
 		flags = PRVM_G_FLOAT(OFS_PARM6);
-	*/
 
 	// sound_starttime exists instead of sound_startposition because in a
 	// networking sense you might not know when something is being received,
@@ -235,7 +230,7 @@ static void VM_CL_sound (prvm_prog_t *prog)
 	// We want to, in a later extension, expose more flags.
 
 	CL_VM_GetEntitySoundOrigin(MAX_EDICTS + PRVM_NUM_FOR_EDICT(entity), org);
-	S_StartSound_StartPosition_Flags(MAX_EDICTS + PRVM_NUM_FOR_EDICT(entity), channel, S_FindName(sample), org, volume, attenuation, startposition, 0, pitchchange > 0.0f ? pitchchange * 0.01f : 1.0f);
+	S_StartSound_StartPosition_Flags(MAX_EDICTS + PRVM_NUM_FOR_EDICT(entity), channel, S_FindName(sample), org, volume, attenuation, startposition, flags, pitchchange > 0.0f ? pitchchange * 0.01f : 1.0f);
 }
 
 // #483 void(vector origin, string sample, float volume, float attenuation) pointsound