try to put a movement controller into SUB_CalcMove to allow for non-linear movement...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_subs.qc

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index 1d1f0bb9bd0f1bfee26d37846ad17085026bbdb4..364068e15b291d4479212de5aac0d5a37c56f045 100644 (file)
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -177,10 +177,28 @@ void SUB_CalcMoveDone (void)
                self.think1 ();
 }
 
+void SUB_CalcMove_controller_think (void)
+{
+       float movephase;
+       float traveltime;
+       vector delta;
+       if(time < self.animstate_endtime) {
+               delta = self.finaldest - self.origin;
+               traveltime = self.animstate_endtime - self.animstate_starttime;
+               
+               self.owner.velocity = delta * (1/traveltime);   // QuakeC doesn't allow vector/float division
+               self.nextthink = time;
+       } else {
+               self = self.owner;
+               self.think();
+       }
+}
+
 void SUB_CalcMove (vector tdest, float tspeed, void() func)
 {
        vector  delta;
        float   traveltime;
+       entity controller;
 
        if (!tspeed)
                objerror ("No speed is defined!");
@@ -206,9 +224,19 @@ void SUB_CalcMove (vector tdest, float tspeed, void() func)
                return;
        }
 
-       self.velocity = delta * (1/traveltime); // QuakeC doesn't allow vector/float division
+       controller = spawn();
+       controller.classname = "SUB_CalcMove_controller";
+       controller.owner = self;
+       controller.origin = self.origin; // starting point
+       controller.finaldest = tdest; // where do we want to end?
+       controller.animstate_starttime = self.ltime;
+       controller.animstate_endtime = self.ltime + traveltime;
+       controller.think = SUB_CalcMove_controller_think;
+       controller.nextthink = time;
 
-       self.nextthink = self.ltime + traveltime;
+       //self.velocity = delta * (1/traveltime);       // QuakeC doesn't allow vector/float division
+
+       //self.nextthink = self.ltime + traveltime;
 }
 
 void SUB_CalcMoveEnt (entity ent, vector tdest, float tspeed, void() func)
@@ -605,7 +633,6 @@ float angc (float a1, float a2)
 .float loddistance1;
 .float loddistance2;
 
-vector NearestPointOnBox(entity box, vector org);
 float LOD_customize()
 {
        float d;
@@ -615,7 +642,7 @@ float LOD_customize()
                d = cvar("loddebug");
                if(d == 1)
                        self.modelindex = self.lodmodelindex0;
-               else if(d == 2)
+               else if(d == 2 || !self.lodmodelindex2)
                        self.modelindex = self.lodmodelindex1;
                else // if(d == 3)
                        self.modelindex = self.lodmodelindex2;
@@ -695,7 +722,8 @@ void LODmodel_attach()
        }
 
        if(self.lodmodelindex1)
-               SetCustomizer(self, LOD_customize, LOD_uncustomize);
+               if not(self.SendEntity)
+                       SetCustomizer(self, LOD_customize, LOD_uncustomize);
 }
 
 void SetBrushEntityModel()