]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Grant access to the FULLVOLUME flag from the QC VM (allows custom background music...
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 6 Mar 2018 01:21:11 +0000 (01:21 +0000)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 3 Apr 2018 13:36:16 +0000 (06:36 -0700)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12344 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=603ac3cc0c6ca5f4a9ccbdac7af0d746c04c957e

clvm_cmds.c
svvm_cmds.c

index 290cabca3e201213ce07a6768361941c735626c2..e5cb60f67905b8dd159ed31e32978b8aaf8977d8 100644 (file)
@@ -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
index b5f96a84827f8e2a69e5d9fe568a2e6b2b6efce0..b41de028d7d00279a77fa3aa84d19715ae944e87 100644 (file)
@@ -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)