From: cloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 15 Jul 2020 13:55:19 +0000 (+0000)
Subject: progs: Correct drawline and sound builtin parameters (terencehill)
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aff4d831a9fbf82dd06abefd91edd1d2f74c2d30;p=xonotic%2Fdarkplaces.git

progs: Correct drawline and sound builtin parameters (terencehill)

https://gitlab.com/xonotic/darkplaces/-/merge_requests/99

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

diff --git a/clvm_cmds.c b/clvm_cmds.c
index a216cf7f..68080dea 100644
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -4170,7 +4170,7 @@ VM_CL_setsize,					// #4 void(entity e, vector min, vector max) setsize (QUAKE)
 NULL,							// #5 void(entity e, vector min, vector max) setabssize (QUAKE)
 VM_break,						// #6 void() break (QUAKE)
 VM_random,						// #7 float() random (QUAKE)
-VM_CL_sound,					// #8 void(entity e, float chan, string samp) sound (QUAKE)
+VM_CL_sound,					// #8 void(entity e, float chan, string samp, float volume, float atten[, float pitchchange[, float flags]]) sound (QUAKE)
 VM_normalize,					// #9 vector(vector v) normalize (QUAKE)
 VM_error,						// #10 void(string e) error (QUAKE)
 VM_objerror,					// #11 void(string e) objerror (QUAKE)
diff --git a/dpdefs/csprogsdefs.qc b/dpdefs/csprogsdefs.qc
index 886b50e1..00245b98 100644
--- a/dpdefs/csprogsdefs.qc
+++ b/dpdefs/csprogsdefs.qc
@@ -337,7 +337,7 @@ void(entity e, vector min, vector max) setsize = #4;
 
 void() break_to_debugger = #6;
 float() random = #7;
-void(entity e, float chan, string samp) sound = #8;
+void(entity e, float chan, string samp, float volume, float atten, ...) sound = #8;
 vector(vector v) normalize = #9;
 void(string e) error = #10;
 void(string e) objerror = #11;
@@ -469,7 +469,7 @@ void() R_EndPolygon = #308;
 vector (vector v) cs_unproject = #310;
 vector (vector v) cs_project = #311;
 
-void(float width, vector pos1, vector pos2, float flag) drawline = #315;
+void(float width, vector pos1, vector pos2, vector rgb, float alpha, float flag) drawline = #315;
 float(string name) iscachedpic = #316;
 string(string name, ...) precache_pic = #317;
 string(string name) precache_cubemap = #317;
diff --git a/dpdefs/progsdefs.qc b/dpdefs/progsdefs.qc
index 2ccd8431..68f161ce 100644
--- a/dpdefs/progsdefs.qc
+++ b/dpdefs/progsdefs.qc
@@ -404,7 +404,7 @@ void(entity e, vector min, vector max) setsize = #4;
 // #5 was removed
 void() break_to_debugger						= #6;
 float() random						= #7;		// returns 0 - 1
-void(entity e, float chan, string samp, float vol, float atten) sound = #8;
+void(entity e, float chan, string samp, float volume, ...) sound = #8;
 vector(vector v) normalize			= #9;
 void(string e, ...) error				= #10;
 void(string e, ...) objerror				= #11;
diff --git a/svvm_cmds.c b/svvm_cmds.c
index 4d46fd9d..54776d56 100644
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -519,6 +519,7 @@ already running on that entity/channel pair.
 An attenuation of 0 will play full volume everywhere in the level.
 Larger attenuations will drop off.
 
+void(entity e, float chan, string samp, float volume[, float atten[, float pitchchange[, float flags]]]) sound (QUAKE)
 =================
 */
 static void VM_SV_sound(prvm_prog_t *prog)
@@ -3205,7 +3206,7 @@ VM_SV_setsize,					// #4 void(entity e, vector min, vector max) setsize (QUAKE)
 NULL,							// #5 void(entity e, vector min, vector max) setabssize (QUAKE)
 VM_break,						// #6 void() break (QUAKE)
 VM_random,						// #7 float() random (QUAKE)
-VM_SV_sound,					// #8 void(entity e, float chan, string samp) sound (QUAKE)
+VM_SV_sound,					// #8 void(entity e, float chan, string samp, float volume[, float atten[, float pitchchange[, float flags]]]) sound (QUAKE)
 VM_normalize,					// #9 vector(vector v) normalize (QUAKE)
 VM_error,						// #10 void(string e) error (QUAKE)
 VM_objerror,					// #11 void(string e) objerror (QUAKE)