Merge branch 'master' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / spawnfunc.qh

diff --git a/qcsrc/lib/spawnfunc.qh b/qcsrc/lib/spawnfunc.qh
index 321610ad3e30b225615283625993ebf959eb621a..3f0f42c6c42bedfe3f2d551bbf216b93b9fc9447 100644 (file)
--- a/qcsrc/lib/spawnfunc.qh
+++ b/qcsrc/lib/spawnfunc.qh
@@ -9,6 +9,8 @@ noref bool require_spawnfunc_prefix;
 /** Not for production use, provides access to a dump of the entity's fields when it is parsed from map data */
 //noref string __fullspawndata;
 
+.string fullspawndata;
+
 // Optional type checking; increases compile time too much to be enabled by default
 #if 0
        bool entityfieldassignablefromeditor(int i)
@@ -178,6 +180,11 @@ noref bool require_spawnfunc_prefix;
                FIELD_SCALAR(fld, noise2) \
                FIELD_SCALAR(fld, noise3) \
                FIELD_SCALAR(fld, noise) \
+               FIELD_SCALAR(fld, notcpm) \
+               FIELD_SCALAR(fld, notfree) \
+               FIELD_SCALAR(fld, notta) \
+               FIELD_SCALAR(fld, notteam) \
+               FIELD_SCALAR(fld, notvq3) \
                FIELD_SCALAR(fld, phase) \
                FIELD_SCALAR(fld, platmovetype) \
                FIELD_SCALAR(fld, race_place) \
@@ -279,6 +286,11 @@ noref bool __spawnfunc_first;
                } \
                if (!this.spawnfunc_checked) { \
                        _checkWhitelisted(this, #id); \
+                       if (__fullspawndata) { \
+                               /* not supported in old DP */ \
+                               /* must be read inside the real spawnfunc */ \
+                               this.fullspawndata = __fullspawndata; \
+                       } \
                        this.spawnfunc_checked = true; \
                        if (this) { \
                                /* not worldspawn, delay spawn */ \