Merge branch 'master' into Mario/use1

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / func / vectormamamam.qc

diff --git a/qcsrc/common/triggers/func/vectormamamam.qc b/qcsrc/common/triggers/func/vectormamamam.qc
index 171c8ecb2820e96670f95fa03861bb4503c77add..2dfa1ac98f9817d4b4cc07b1d245416db3ca00ee 100644 (file)
--- a/qcsrc/common/triggers/func/vectormamamam.qc
+++ b/qcsrc/common/triggers/func/vectormamamam.qc
@@ -58,7 +58,7 @@ vector func_vectormamamam_origin(entity o, float t)
 }
 
 void func_vectormamamam_controller_think()
-{
+{SELFPARAM();
        self.nextthink = time + 0.1;
 
        if(self.owner.active != ACTIVE_ACTIVE)
@@ -71,7 +71,7 @@ void func_vectormamamam_controller_think()
                self.owner.velocity = (self.owner.destvec + func_vectormamamam_origin(self.owner, 0.1) - self.owner.origin) * 10;
 }
 
-void func_vectormamamam_findtarget()
+void func_vectormamamam_findtarget(entity this)
 {
        if(self.target != "")
                self.wp00 = find(world, targetname, self.target);
@@ -91,14 +91,13 @@ void func_vectormamamam_findtarget()
        self.destvec = self.origin - func_vectormamamam_origin(self, 0);
 
        entity controller;
-       controller = spawn();
-       controller.classname = "func_vectormamamam_controller";
+       controller = new(func_vectormamamam_controller);
        controller.owner = self;
        controller.nextthink = time + 1;
        controller.think = func_vectormamamam_controller_think;
 }
 
-void spawnfunc_func_vectormamamam()
+spawnfunc(func_vectormamamam)
 {
        if (self.noise != "")
        {
@@ -146,8 +145,8 @@ void spawnfunc_func_vectormamamam()
                return;
 
        // wait for targets to spawn
-       trigger_setnextthink(self, self.ltime + 999999999);
-       self.think = SUB_NullThink; // for PushMove
+       self.SUB_NEXTTHINK = self.SUB_LTIME + 999999999;
+       self.SUB_THINK = SUB_NullThink; // for PushMove
 
        // Savage: Reduce bandwith, critical on e.g. nexdm02
        self.effects |= EF_LOWPRECISION;