From 4c4b7bb9d36be542ed6aedadff997c000a00c752 Mon Sep 17 00:00:00 2001 From: Jakob MG Date: Sun, 17 Jun 2012 18:42:47 +0200 Subject: [PATCH] Fix walker turret. Mute some spam (unrefs. again.) --- qcsrc/client/tturrets.qc | 2 +- qcsrc/server/command/cmd.qc | 2 +- qcsrc/server/movelib.qc | 10 +++++----- qcsrc/server/vehicles/spiderbot.qc | 2 +- qcsrc/server/w_common.qc | 4 ++-- qcsrc/server/w_porto.qc | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc index d7abeb091..3aa3c3b2b 100644 --- a/qcsrc/client/tturrets.qc +++ b/qcsrc/client/tturrets.qc @@ -388,7 +388,7 @@ void turret_walker_draw() return; fixedmakevectors(self.angles); - movelib_groundalign4point(300, 100, 0.25); + movelib_groundalign4point(300, 100, 0.25, 45); setorigin(self, self.origin + self.velocity * dt); self.tur_head.angles += dt * self.tur_head.move_avelocity; self.angles_y = self.move_angles_y; diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index b659d44cc..c4e85e28e 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -358,7 +358,7 @@ void ClientCommand_sentcvar(float request, float argc, string command) { if(argv(1) != "") { - float tokens; + //float tokens; string s; if(argc == 2) // undefined cvar: use the default value on the server then diff --git a/qcsrc/server/movelib.qc b/qcsrc/server/movelib.qc index 60dc90b69..9b9f7fde0 100644 --- a/qcsrc/server/movelib.qc +++ b/qcsrc/server/movelib.qc @@ -190,7 +190,7 @@ Yed need to set v_up and v_forward (generally by calling makevectors) before cal **/ #endif -void movelib_groundalign4point(float spring_length, float spring_up, float blendrate) +void movelib_groundalign4point(float spring_length, float spring_up, float blendrate, float _max) { vector a, b, c, d, e, r, push_angle, ahead, side; @@ -227,11 +227,11 @@ void movelib_groundalign4point(float spring_length, float spring_up, float blend r = self.origin; r_z = r_z; - push_angle_x = (a_z - c_z) * 90; - push_angle_x += (b_z - d_z) * 90; + push_angle_x = (a_z - c_z) * _max; + push_angle_x += (b_z - d_z) * _max; - push_angle_z = (b_z - a_z) * 90; - push_angle_z += (d_z - c_z) * 90; + push_angle_z = (b_z - a_z) * _max; + push_angle_z += (d_z - c_z) * _max; //self.angles_x += push_angle_x * 0.95; //self.angles_z += push_angle_z * 0.95; diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc index be3e88961..0c4bd21f1 100644 --- a/qcsrc/server/vehicles/spiderbot.qc +++ b/qcsrc/server/vehicles/spiderbot.qc @@ -241,7 +241,7 @@ float spiderbot_frame() //fixedmakevectors(spider.angles); makevectors(spider.angles + '-2 0 0' * spider.angles_x); - movelib_groundalign4point(autocvar_g_vehicle_spiderbot_springlength, autocvar_g_vehicle_spiderbot_springup, autocvar_g_vehicle_spiderbot_springblend); + movelib_groundalign4point(autocvar_g_vehicle_spiderbot_springlength, autocvar_g_vehicle_spiderbot_springup, autocvar_g_vehicle_spiderbot_springblend, autocvar_g_vehicle_spiderbot_tiltlimit); if(spider.flags & FL_ONGROUND) { diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/w_common.qc index a2f23956e..3780fc713 100644 --- a/qcsrc/server/w_common.qc +++ b/qcsrc/server/w_common.qc @@ -339,7 +339,7 @@ float W_BallisticBullet_LeaveSolid(float eff) void W_BallisticBullet_Touch (void) { - float density; + //float density; if(self.think == W_BallisticBullet_LeaveSolid_think) // skip this! return; @@ -400,7 +400,7 @@ void fireBallisticBullet_trace_callback(vector start, vector hit, vector end) void fireBallisticBullet(vector start, vector dir, float spread, float pSpeed, float lifetime, float damage, float headshotbonus, float force, float dtype, float tracereffects, float gravityfactor, float bulletconstant) { - float lag, dt, savetime, density; + float lag, dt, savetime; //, density; entity pl, oldself; float antilagging; diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc index 3134a8bb3..f95e554b0 100644 --- a/qcsrc/server/w_porto.qc +++ b/qcsrc/server/w_porto.qc @@ -272,7 +272,7 @@ void spawnfunc_weapon_porto (void) float w_nexball_weapon(float req); float w_porto(float req) { - vector v_angle_save; + //vector v_angle_save; if (g_nexball) { return w_nexball_weapon(req); } if (req == WR_AIM) -- 2.39.2