Merge branch 'drjaska/menu-music' into 'master'

re-allow main menu to play music when coming back to it

Closes #2866

See merge request xonotic/xonotic-data.pk3dir!1240

diff --git a/qcsrc/common/mapobjects/triggers.qc b/qcsrc/common/mapobjects/triggers.qc
index 5fc5f4f3fb1bea0af0fc09682ab7b6196e857aeb..cfc1d6fac67f6222162c444e665f2dd31133b443 100644 (file)
--- a/qcsrc/common/mapobjects/triggers.qc
+++ b/qcsrc/common/mapobjects/triggers.qc
@@ -205,6 +205,8 @@ void trigger_common_read(entity this, bool withtarget)
                this.angles = '0 0 0';
 
        this.modelindex = ReadShort();
+       if (this.modelindex)
+               setmodelindex(this, this.modelindex);
        this.mins = ReadVector();
        this.maxs = ReadVector();
        this.scale = ReadByte() / 16;

diff --git a/qcsrc/dpdefs/upstream/csprogsdefs.qc b/qcsrc/dpdefs/upstream/csprogsdefs.qc
index 4cff5482abff6c4d512cacbb565fb67685039a69..e392bf8eab5403e94c179858f1a21a10457332a2 100644 (file)
--- a/qcsrc/dpdefs/upstream/csprogsdefs.qc
+++ b/qcsrc/dpdefs/upstream/csprogsdefs.qc
@@ -1443,6 +1443,13 @@ void(float fh, entity e) writetofile = #606;
 float(string s) isfunction = #607;
 void(entity e, string s) parseentitydata = #608;
 
+//DP_QC_FINDCHAIN_TOFIELD
+//see: dpextensions.qc
+entity(vector org, float rad, .entity tofield) findradius_tofield = #22;
+entity(.string fld, string match, .entity tofield) findchain_tofield = #402;
+entity(.float fld, float match, .entity tofield) findchainflags_tofield = #450;
+entity(.float fld, float match, .entity tofield) findchainfloat_tofield = #403;
+
 //DP_COVERAGE
 //idea: divVerent
 //darkplaces implementation: divVerent