From 78b84505d8ea876e1238775008ff9e8022a7b1d2 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Thu, 24 May 2012 18:17:16 +0300 Subject: [PATCH] Fix curvetarget rename, and remove useless commented out code of the old platform movement system --- qcsrc/server/defs.qh | 2 +- qcsrc/server/g_subs.qc | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 71620c9dc..5cafe8892 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -529,7 +529,7 @@ void target_voicescript_clear(entity pl); .string target2; .string target3; .string target4; -.string curve; +.string curvetarget; .float target_random; .float trigger_reverse; diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc index 31bbeb6bc..0c1eff197 100644 --- a/qcsrc/server/g_subs.qc +++ b/qcsrc/server/g_subs.qc @@ -189,29 +189,6 @@ void SUB_CalcMove_controller_think (void) traveltime = self.animstate_endtime - self.animstate_starttime; phasepos = (nexttick - self.animstate_starttime) / traveltime; // range: [0, 1] phasepos = cubic_speedfunc(self.platmovetype_start, self.platmovetype_end, phasepos); - - /* switch(self.platmovetype) - { - case 1: // linear - break; - // phasepos = cubic_speedfunc(1, 1, phasepos); // identity - case 2: // cosine - // phasepos = (1 - cos(phasepos * 3.14159265)) / 2; - phasepos = cubic_speedfunc(0, 0, phasepos); - break; - case 3: // inverted cosine - // phasepos = acos(1 - phasepos * 2) / 3.14159265; - phasepos = cubic_speedfunc(2, 2, phasepos); - break; - case 4: // half cosine - // phasepos = (1 - cos(phasepos * (3.14159265 / 2))); - phasepos = cubic_speedfunc(0, 1.5, phasepos); - break; - case 5: // inverted half cosine - // phasepos = sin(phasepos * (3.14159265 / 2)); - phasepos = cubic_speedfunc(1.5, 0, phasepos); - break; - } */ nextpos = self.origin + (delta * phasepos) + (delta2 * phasepos * phasepos); // derivative: delta + 2 * delta2 * phasepos (e.g. for angle positioning) -- 2.39.2