]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix walker turret. Mute some spam (unrefs. again.)
authorJakob MG <jakob_mg@hotmail.com>
Sun, 17 Jun 2012 16:42:47 +0000 (18:42 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 17 Jun 2012 16:42:47 +0000 (18:42 +0200)
qcsrc/client/tturrets.qc
qcsrc/server/command/cmd.qc
qcsrc/server/movelib.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/w_common.qc
qcsrc/server/w_porto.qc

index d7abeb0919de42e95d278942f363cb9009336b96..3aa3c3b2bbe6074ccfffc0588921abf688e8b56b 100644 (file)
@@ -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;
index b659d44ccab532d2c12502fe4dee0e160bc0662e..c4e85e28ef55d37debee2e5fc81c9da48ae7b419 100644 (file)
@@ -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
index 60dc90b699d728c7af1e8fe69a5b45dba861cd20..9b9f7fde01abe5dc22dcd51310665c265aa15e6d 100644 (file)
@@ -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;
index be3e889617f0372283af2ade3758735232307126..0c4bd21f19b9c36f0041db601db13f7812844d4a 100644 (file)
@@ -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)
     {
index a2f23956eed6f4f3f7b0389d523e8062555fb2d1..3780fc71384d987160f8e56c3063166fdbcc1bb3 100644 (file)
@@ -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;
 
index 3134a8bb3b66805ac2981732e10952a432a4478d..f95e554b0e9799d78a52108ca39e72f2c7dde053 100644 (file)
@@ -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)