From: divverent Date: Tue, 6 Mar 2018 01:21:11 +0000 (+0000) Subject: Grant access to the FULLVOLUME flag from the QC VM (allows custom background music... X-Git-Tag: xonotic-v0.8.5~71 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7c0a2701bd56810e1b49326d2cf8b38ec2b9e174;p=xonotic%2Fdarkplaces.git Grant access to the FULLVOLUME flag from the QC VM (allows custom background music mods that aren't affected by the volume cvar) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12344 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=603ac3cc0c6ca5f4a9ccbdac7af0d746c04c957e --- diff --git a/clvm_cmds.c b/clvm_cmds.c index 290cabca..e5cb60f6 100644 --- a/clvm_cmds.c +++ b/clvm_cmds.c @@ -208,7 +208,7 @@ static void VM_CL_sound (prvm_prog_t *prog) else { // LordHavoc: we only let the qc set certain flags, others are off-limits - flags = (int)PRVM_G_FLOAT(OFS_PARM6) & (CHANNELFLAG_RELIABLE | CHANNELFLAG_FORCELOOP | CHANNELFLAG_PAUSED); + flags = (int)PRVM_G_FLOAT(OFS_PARM6) & (CHANNELFLAG_RELIABLE | CHANNELFLAG_FORCELOOP | CHANNELFLAG_PAUSED | CHANNELFLAG_FULLVOLUME); } // sound_starttime exists instead of sound_startposition because in a diff --git a/svvm_cmds.c b/svvm_cmds.c index b5f96a84..b41de028 100644 --- a/svvm_cmds.c +++ b/svvm_cmds.c @@ -559,7 +559,7 @@ static void VM_SV_sound(prvm_prog_t *prog) else { // LordHavoc: we only let the qc set certain flags, others are off-limits - flags = (int)PRVM_G_FLOAT(OFS_PARM6) & (CHANNELFLAG_RELIABLE | CHANNELFLAG_FORCELOOP | CHANNELFLAG_PAUSED); + flags = (int)PRVM_G_FLOAT(OFS_PARM6) & (CHANNELFLAG_RELIABLE | CHANNELFLAG_FORCELOOP | CHANNELFLAG_PAUSED | CHANNELFLAG_FULLVOLUME); } if (nvolume < 0 || nvolume > 255)