From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 3 Oct 2015 09:02:24 +0000 (+1000)
Subject: Spawnfuncs: whitelist more fields
X-Git-Tag: xonotic-v0.8.2~1883
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d1d563670b245cfebe88eb715c7aee26aa0443a;p=xonotic%2Fxonotic-data.pk3dir.git

Spawnfuncs: whitelist more fields
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 18bf6af2a..52e5af984 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -39,6 +39,7 @@ void monster_dropitem()
 
 	vector org = self.origin + ((self.mins + self.maxs) * 0.5);
 	entity e = spawn();
+	e.spawnfunc_checked = true;
 
 	e.monster_loot = self.monster_loot;
 
diff --git a/qcsrc/common/triggers/target/spawn.qc b/qcsrc/common/triggers/target/spawn.qc
index 554d38226..10fe3c764 100644
--- a/qcsrc/common/triggers/target/spawn.qc
+++ b/qcsrc/common/triggers/target/spawn.qc
@@ -280,6 +280,7 @@ void target_spawn_use()
 		if(!target_spawn_cancreate())
 			return;
 		e = spawn();
+		e.spawnfunc_checked = true;
 		target_spawn_useon(e);
 		e.target_spawn_id = self.target_spawn_id;
 	}
diff --git a/qcsrc/lib/spawnfunc.qh b/qcsrc/lib/spawnfunc.qh
index 00c9be135..1ab059cdf 100644
--- a/qcsrc/lib/spawnfunc.qh
+++ b/qcsrc/lib/spawnfunc.qh
@@ -74,12 +74,15 @@ bool entityfieldassignablefromeditor(int i) {
     FIELD_SCALAR(fld, cnt) \
     FIELD_SCALAR(fld, colormap) \
     FIELD_SCALAR(fld, count) \
+    FIELD_SCALAR(fld, curvetarget) \
+    FIELD_SCALAR(fld, cvarfilter) \
     FIELD_SCALAR(fld, debrisdamageforcescale) \
     FIELD_SCALAR(fld, debrisfadetime) \
     FIELD_SCALAR(fld, debristimejitter) \
     FIELD_SCALAR(fld, debristime) \
     FIELD_SCALAR(fld, debris) \
     FIELD_SCALAR(fld, delay) \
+    FIELD_SCALAR(fld, dmgtime) \
     FIELD_SCALAR(fld, dmg) \
     FIELD_SCALAR(fld, dmg_edge) \
     FIELD_SCALAR(fld, dmg_force) \
@@ -87,8 +90,10 @@ bool entityfieldassignablefromeditor(int i) {
     FIELD_SCALAR(fld, effects) \
     FIELD_SCALAR(fld, flags) \
     FIELD_SCALAR(fld, fog) \
+    FIELD_SCALAR(fld, frags) \
     FIELD_SCALAR(fld, frame) \
     FIELD_SCALAR(fld, gametypefilter) \
+    FIELD_SCALAR(fld, geomtype) \
     FIELD_SCALAR(fld, gravity) \
     FIELD_SCALAR(fld, health) \
     FIELD_SCALAR(fld, height) \
@@ -106,6 +111,7 @@ bool entityfieldassignablefromeditor(int i) {
     FIELD_SCALAR(fld, modelindex) \
     FIELD_SCALAR(fld, modelscale) \
     FIELD_SCALAR(fld, model) \
+    FIELD_SCALAR(fld, monster_moveflags) \
     FIELD_SCALAR(fld, movetype) \
     FIELD_SCALAR(fld, netname) \
     FIELD_SCALAR(fld, nextthink) \
@@ -114,6 +120,7 @@ bool entityfieldassignablefromeditor(int i) {
     FIELD_SCALAR(fld, noise2) \
     FIELD_SCALAR(fld, noise) \
     FIELD_SCALAR(fld, phase) \
+    FIELD_SCALAR(fld, platmovetype) \
     FIELD_SCALAR(fld, race_place) \
     FIELD_SCALAR(fld, radius) \
     FIELD_SCALAR(fld, respawntimejitter) \
@@ -133,6 +140,7 @@ bool entityfieldassignablefromeditor(int i) {
     FIELD_SCALAR(fld, targetname) \
     FIELD_SCALAR(fld, target) \
     FIELD_SCALAR(fld, target_random) \
+    FIELD_SCALAR(fld, target_range) \
     FIELD_SCALAR(fld, team) \
     FIELD_SCALAR(fld, turret_scale_health) \
     FIELD_SCALAR(fld, turret_scale_range) \
@@ -141,6 +149,7 @@ bool entityfieldassignablefromeditor(int i) {
     FIELD_SCALAR(fld, wait) \
     FIELD_SCALAR(fld, warpzone_fadeend) \
     FIELD_SCALAR(fld, warpzone_fadestart) \
+    FIELD_SCALAR(fld, weapon) \
     FIELD_VEC(fld, absmax) \
     FIELD_VEC(fld, absmin) \
     FIELD_VEC(fld, angles) \