From: Rudolf Polzer Date: Fri, 11 Oct 2013 14:54:39 +0000 (+0200) Subject: Fix compilation with gmqcc. X-Git-Tag: xonotic-v0.8.0~294 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6a28c11c8abd729c7f95ad7050d204aa2453d2ff;p=xonotic%2Fxonotic-data.pk3dir.git Fix compilation with gmqcc. --- diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc index 96ccc267c..cc6f3694b 100644 --- a/qcsrc/server/g_subs.qc +++ b/qcsrc/server/g_subs.qc @@ -188,6 +188,7 @@ void SUB_CalcMove_controller_think (void) self.owner.angles_z -= 360 * floor((self.owner.angles_z - destangle_z) / 360 + 0.5); angloc = destangle - self.owner.angles; angloc = angloc * (1 / sys_frametime); // so it arrives for the next frame + self.owner.avelocity = angloc; } if(nexttick < self.animstate_endtime) veloc = nextpos - self.owner.origin; @@ -196,7 +197,6 @@ void SUB_CalcMove_controller_think (void) veloc = veloc * (1 / sys_frametime); // so it arrives for the next frame self.owner.velocity = veloc; - self.owner.avelocity = angloc; self.nextthink = nexttick; } else { // derivative: delta + 2 * delta2 (e.g. for angle positioning) diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc index 9ca98afb8..97ae43e1e 100644 --- a/qcsrc/server/t_plats.qc +++ b/qcsrc/server/t_plats.qc @@ -336,8 +336,8 @@ void train_wait() void train_next() { - entity targ, cp; - vector cp_org; + entity targ, cp = world; + vector cp_org = '0 0 0'; targ = find(world, targetname, self.target); self.target = targ.target; @@ -348,8 +348,6 @@ void train_next() cp = find(world, targetname, targ.curvetarget); // get its second target (the control point) cp_org = cp.origin - self.view_ofs; // no control point found, assume a straight line to the destination } - else - cp = world; // no cp } if (self.target == "") objerror("train_next: no next target");