[nexuiz-commits] r8447 - trunk/data/qcsrc/server/vehicles

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-12-22 16:07:07 -0500 (Tue, 22 Dec 2009)
New Revision: 8447

Modified:
   trunk/data/qcsrc/server/vehicles/racer.qc
   trunk/data/qcsrc/server/vehicles/spiderbot.qc
Log:
fix sys_ticrate -> sys_frametime in vehicles


Modified: trunk/data/qcsrc/server/vehicles/racer.qc
===================================================================
--- trunk/data/qcsrc/server/vehicles/racer.qc	2009-12-22 10:21:28 UTC (rev 8446)
+++ trunk/data/qcsrc/server/vehicles/racer.qc	2009-12-22 21:07:07 UTC (rev 8447)
@@ -244,7 +244,7 @@
 
     rocket = spawn();
     setsize (rocket, '-1 -1 -1', '1 1 1');
-    rocket.lip             = cvar("g_vehicle_racer_rocket_accel") * sys_ticrate;
+    rocket.lip             = cvar("g_vehicle_racer_rocket_accel") * sys_frametime;
     rocket.wait            = cvar("g_vehicle_racer_rocket_turnrate");
     rocket.solid           = SOLID_BBOX;
     rocket.movetype        = MOVETYPE_FLYMISSILE;
@@ -336,7 +336,7 @@
     makevectors(racer.angles);
 
     // Rotate Body
-    ftmp = racer_turnspeed * sys_ticrate;
+    ftmp = racer_turnspeed * sys_frametime;
     ftmp2 = ftmp * -1;
 
     ftmp = bound(ftmp2,shortangle_f(player.v_angle_y - racer.angles_y,racer.angles_y),ftmp);
@@ -351,7 +351,7 @@
     racer.angles_y = ftmp2;
 
     // Pitch Body
-    ftmp = racer_pitchspeed * sys_ticrate;
+    ftmp = racer_pitchspeed * sys_frametime;
     ftmp2 = ftmp * -1;
 
     ftmp = bound(ftmp2,shortangle_f(player.v_angle_x - racer.angles_x,racer.angles_x),ftmp);

Modified: trunk/data/qcsrc/server/vehicles/spiderbot.qc
===================================================================
--- trunk/data/qcsrc/server/vehicles/spiderbot.qc	2009-12-22 10:21:28 UTC (rev 8446)
+++ trunk/data/qcsrc/server/vehicles/spiderbot.qc	2009-12-22 21:07:07 UTC (rev 8447)
@@ -187,7 +187,7 @@
     if((self.vehicle_reload1 == 1) || (!self.owner.BUTTON_ATCK))
     {
 
-        ftmp = 1 / cvar("g_vehicle_spiderbot_minigun_cooldown") * sys_ticrate;
+        ftmp = 1 / cvar("g_vehicle_spiderbot_minigun_cooldown") * sys_frametime;
         self.owner.vehicle_reload1 = max(self.owner.vehicle_reload1 - ftmp, 0);
         if(self.owner.vehicle_reload1 <= 0)
             self.vehicle_reload1 = 0;
@@ -199,8 +199,8 @@
     {
 
         // Animate miniguns
-        self.gun1.angles_z += (1440 * sys_ticrate);
-        self.gun2.angles_z -= (1440 * sys_ticrate);
+        self.gun1.angles_z += (1440 * sys_frametime);
+        self.gun2.angles_z -= (1440 * sys_frametime);
         if(self.gun1.angles_z >= 360)
         {
             self.gun1.angles_z = 0;
@@ -295,13 +295,13 @@
     ad = player.v_angle -  (spider.tur_head.angles + spider.angles);
 
     // Rotate head
-    ftmp = cvar("g_vehicle_spiderbot_head_turnspeed") * sys_ticrate;
+    ftmp = cvar("g_vehicle_spiderbot_head_turnspeed") * sys_frametime;
     ftmp2 = ftmp * -1;
     spider.tur_head.angles_y += bound(ftmp2,shortangle_f(ad_y,spider.tur_head.angles_y),ftmp);
     spider.tur_head.angles_y = bound(cvar("g_vehicle_spiderbot_head_turnlimit") * -1,spider.tur_head.angles_y,cvar("g_vehicle_spiderbot_head_turnlimit"));
 
     // Pitch head
-    ftmp = cvar("g_vehicle_spiderbot_head_pitchspeed") * sys_ticrate;
+    ftmp = cvar("g_vehicle_spiderbot_head_pitchspeed") * sys_frametime;
     ftmp2 = ftmp * -1;
     spider.tur_head.angles_x += bound(ftmp2,shortangle_f(ad_x,spider.tur_head.angles_x),ftmp);
     spider.tur_head.angles_x = bound(cvar("g_vehicle_spiderbot_head_pitchlimit_down"),spider.tur_head.angles_x,cvar("g_vehicle_spiderbot_head_pitchlimit_up"));
@@ -311,7 +311,7 @@
     //player.angles_x *= -1;
 
     // Turn Body
-    ftmp = cvar("g_vehicle_spiderbot_turnspeed") * sys_ticrate;
+    ftmp = cvar("g_vehicle_spiderbot_turnspeed") * sys_frametime;
     ftmp2 = ftmp * -1;
     ftmp = bound(ftmp2,spider.tur_head.angles_y,ftmp);