From a83efc591039d68bc106b09001c3f46a14eb52a4 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 24 May 2012 15:41:59 +0200 Subject: [PATCH] platmovetype fixes --- qcsrc/server/g_subs.qc | 2 +- qcsrc/server/t_plats.qc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc index 5ac8f7348..9454f14f4 100644 --- a/qcsrc/server/g_subs.qc +++ b/qcsrc/server/g_subs.qc @@ -373,7 +373,7 @@ void SUB_CalcMove (vector tdest, float tspeedtype, float tspeed, void() func) // of controlled animation, so let's just use linear movement. // Alternatively entities can choose to specify non-controlled movement. // The only currently implemented alternative movement is linear (value 1) - if (traveltime < 0.15 || self.platmovetype_start || self.platmovetype_end) // is this correct? + if (traveltime < 0.15 || (self.platmovetype_start == 1 && self.platmovetype_end == 1)) // is this correct? { self.velocity = delta * (1/traveltime); // QuakeC doesn't allow vector/float division self.nextthink = self.ltime + traveltime; diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc index 68a4fc57f..beab82ae5 100644 --- a/qcsrc/server/t_plats.qc +++ b/qcsrc/server/t_plats.qc @@ -348,7 +348,7 @@ void train_next() if (!self.wait) self.wait = 0.1; - if(targ.platmovetype_start || targ.platmovetype_end) + if(targ.platmovetype) { // this path_corner contains a movetype overrider, apply it self.platmovetype_start = targ.platmovetype_start; @@ -425,7 +425,8 @@ void spawnfunc_func_train() 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; -- 2.39.2