From: terencehill <piuntn@gmail.com>
Date: Sun, 3 Sep 2023 16:35:15 +0000 (+0000)
Subject: Merge branch 'drjaska/menu-music' into 'master'
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=8f3de97a3fb64e38efeb448c100940d3aa8f9cd9;hp=7892582d6cc926aeb623c2fa6ec904344b2139a2;p=xonotic%2Fxonotic-data.pk3dir.git

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 5fc5f4f3f..cfc1d6fac 100644
--- 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 4cff5482a..e392bf8ea 100644
--- 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