}
}
+.float platmovetype_start_default, platmovetype_end_default;
float set_platmovetype(entity e, string s)
{
// sets platmovetype_start and platmovetype_end based on a string consisting of two values
self = oldself;
self.enemy = world;
- // if using bezier curves and turning is enabled, the train will turn toward the next point while waiting
- if(!self.train_wait_turning)
- if(self.spawnflags & 1 && self.bezier_turn && self.wait >= 0)
+ // if turning is enabled, the train will turn toward the next point while waiting
+ if(self.platmovetype_turn && !self.train_wait_turning)
{
- entity targ;
+ entity targ, cp;
vector org;
targ = find(world, targetname, self.target);
- org = normalize(targ.origin);
- SUB_CalcAngleMove(org, TSPEED_TIME, self.ltime - time + self.wait, train_wait);
- self.train_wait_turning = TRUE;
- return;
+ if((self.spawnflags & 1) && targ.curvetarget)
+ cp = find(world, targetname, targ.curvetarget);
+ else
+ cp = world;
+
+ if(cp) // bezier curves movement
+ org = vectoangles(cp.origin - self.origin); // use the origin of the control point of the next path_corner
+ else // linear movement
+ org = vectoangles(targ.origin - self.origin); // use the origin of the next path_corner
+
+ if(self.wait >= 0) // slow turning
+ {
+ SUB_CalcAngleMove(org, TSPEED_TIME, self.ltime - time + self.wait, train_wait);
+ self.train_wait_turning = TRUE;
+ return;
+ }
+ else // instant turning
+ self.angles = org;
}
if(self.noise != "")
self.target = targ.target;
if (self.spawnflags & 1)
{
- cp = find(world, target, targ.targetname); // get the previous corner first
- cp = find(world, targetname, cp.curve); // now get its second target (the control point)
- if(cp.targetname == "")
- cp_org = targ.origin - self.mins; // no control point found, assume a straight line to the destination
+ if(targ.curvetarget)
+ {
+ cp = find(world, targetname, targ.curvetarget); // get its second target (the control point)
+ cp_org = cp.origin - self.mins; // no control point found, assume a straight line to the destination
+ }
else
- cp_org = cp.origin - self.mins;
+ cp = world; // no cp
}
if (!self.target)
objerror("train_next: no next target");
if (!self.wait)
self.wait = 0.1;
- // override train movement type if necessary
- if(targ.platmovetype_start || targ.platmovetype_end)
- set_platmovetype(self, targ.platmovetype);
+ if(targ.platmovetype)
+ {
+ // this path_corner contains a movetype overrider, apply it
+ self.platmovetype_start = targ.platmovetype_start;
+ self.platmovetype_end = targ.platmovetype_end;
+ }
else
- set_platmovetype(self, self.platmovetype);
+ {
+ // this path_corner doesn't contain a movetype overrider, use the train's defaults
+ self.platmovetype_start = self.platmovetype_start_default;
+ self.platmovetype_end = self.platmovetype_end_default;
+ }
if (targ.speed)
{
- if (self.spawnflags & 1)
+ if (cp)
SUB_CalcMove_Bezier(cp_org, targ.origin - self.mins, TSPEED_LINEAR, targ.speed, train_wait);
else
SUB_CalcMove(targ.origin - self.mins, TSPEED_LINEAR, targ.speed, train_wait);
}
else
{
- if (self.spawnflags & 1)
+ if (cp)
SUB_CalcMove_Bezier(cp_org, targ.origin - self.mins, TSPEED_LINEAR, self.speed, train_wait);
else
SUB_CalcMove(targ.origin - self.mins, TSPEED_LINEAR, self.speed, train_wait);
if (!self.speed)
self.speed = 100;
if (self.spawnflags & 2)
- self.bezier_turn = TRUE;
+ self.platmovetype_turn = TRUE;
if not(InitMovingBrushTrigger())
return;
self.dmgtime = 0.25;
self.dmgtime2 = time;
- set_platmovetype(self, self.platmovetype);
+ if(!set_platmovetype(self, self.platmovetype))
+ return;
+ self.platmovetype_start_default = self.platmovetype_start;
+ self.platmovetype_end_default = self.platmovetype_end;
// TODO make a reset function for this one
}