Merge branch 'master' into Mario/showspecs

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / target / spawn.qc

diff --git a/qcsrc/common/triggers/target/spawn.qc b/qcsrc/common/triggers/target/spawn.qc
index 74ac8fd99ad8899e6d556cbf9837929f0e2b2664..bc5271040c691516623d68240c241faad5fb6b32 100644 (file)
--- a/qcsrc/common/triggers/target/spawn.qc
+++ b/qcsrc/common/triggers/target/spawn.qc
@@ -21,14 +21,14 @@ float target_spawn_spawnfunc_field;
 .float target_spawn_id;
 float target_spawn_count;
 
-void target_spawn_helper_setmodel()
-{SELFPARAM();
-       _setmodel(self, self.model);
+void target_spawn_helper_setmodel(entity this)
+{
+       _setmodel(this, this.model);
 }
 
-void target_spawn_helper_setsize()
-{SELFPARAM();
-       setsize(self, self.mins, self.maxs);
+void target_spawn_helper_setsize(entity this)
+{
+       setsize(this, this.mins, this.maxs);
 }
 
 void target_spawn_edit_entity(entity this, entity e, string msg, entity kt, entity t2, entity t3, entity t4, entity act, entity trigger)
@@ -114,7 +114,7 @@ void target_spawn_edit_entity(entity this, entity e, string msg, entity kt, enti
                                        if(time < act.pushltime)
                                                valueent = act.pusher;
                                        else
-                                               valueent = world;
+                                               valueent = NULL;
                                        value = "";
                                }
                                else if(value == "target")
@@ -144,7 +144,7 @@ void target_spawn_edit_entity(entity this, entity e, string msg, entity kt, enti
                                }
                                else if(value == "time")
                                {
-                                       valueent = world;
+                                       valueent = NULL;
                                        value = ftos(time);
                                }
                                else
@@ -217,7 +217,7 @@ void target_spawn_edit_entity(entity this, entity e, string msg, entity kt, enti
                                value = strcat("target_spawn_helper", value);
                        putentityfieldstring(target_spawn_spawnfunc_field, e, value);
 
-                       WITHSELF(e, e.target_spawn_spawnfunc(e));
+                       e.target_spawn_spawnfunc(e);
 
                        // We called an external function, so we have to re-tokenize msg.
                        n = tokenize_console(msg);
@@ -238,10 +238,10 @@ void target_spawn_useon(entity e, entity this, entity actor, entity trigger)
                this,
                e,
                this.message,
-               find(world, targetname, this.killtarget),
-               find(world, targetname, this.target2),
-               find(world, targetname, this.target3),
-               find(world, targetname, this.target4),
+               find(NULL, targetname, this.killtarget),
+               find(NULL, targetname, this.target2),
+               find(NULL, targetname, this.target3),
+               find(NULL, targetname, this.target4),
                actor,
                trigger
        );
@@ -257,7 +257,7 @@ bool target_spawn_cancreate(entity this)
                return true;
 
        ++c; // increase count to not include MYSELF
-       for(e = world; (e = findfloat(e, target_spawn_id, this.target_spawn_id)); --c)
+       for(e = NULL; (e = findfloat(e, target_spawn_id, this.target_spawn_id)); --c)
                ;
 
        // if c now is 0, we have AT LEAST the given count (maybe more), so don't spawn any more
@@ -287,8 +287,10 @@ void target_spawn_use(entity this, entity actor, entity trigger)
        else
        {
                // edit entity
-               for(entity e = world; (e = find(e, targetname, this.target)); )
-                       target_spawn_useon(e, this, actor, trigger);
+               FOREACH_ENTITY_STRING(targetname, this.target,
+               {
+                       target_spawn_useon(it, this, actor, trigger);
+               });
        }
 }
 
@@ -330,9 +332,9 @@ void initialize_field_db()
 spawnfunc(target_spawn)
 {
        initialize_field_db();
-       self.use = target_spawn_use;
-       self.message = strzone(strreplace("'", "\"", self.message));
-       self.target_spawn_id = ++target_spawn_count;
-       InitializeEntity(self, target_spawn_spawnfirst, INITPRIO_LAST);
+       this.use = target_spawn_use;
+       this.message = strzone(strreplace("'", "\"", this.message));
+       this.target_spawn_id = ++target_spawn_count;
+       InitializeEntity(this, target_spawn_spawnfirst, INITPRIO_LAST);
 }
 #endif