Make most server includes order insensitive

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / vehicles / vehicles.qc

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 524f85e199dee3e8503cd2bcef0822c82246b4b7..3778b040553548ccbb5aea806372972f7742c809 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -1,3 +1,12 @@
+#include "vehicles.qh"
+
+#include "../cl_player.qh"
+#include "../waypointsprites.qh"
+
+#include "../bot/waypoints.qh"
+
+.float() PlayerPhysplug;
+
 float autocvar_g_vehicles_crush_dmg;
 float autocvar_g_vehicles_crush_force;
 float autocvar_g_vehicles_delayspawn;
@@ -26,7 +35,7 @@ void vehicles_setreturn();
 const float MAX_AXH = 4;
 .entity AuxiliaryXhair[MAX_AXH];
 
-float SendAuxiliaryXhair(entity to, float sf)
+float SendAuxiliaryXhair(entity to, int sf)
 {
 
        WriteByte(MSG_ENTITY, ENT_CLIENT_AUXILIARYXHAIR);
@@ -44,7 +53,7 @@ float SendAuxiliaryXhair(entity to, float sf)
     return true;
 }
 
-void UpdateAuxiliaryXhair(entity own, vector loc, vector clr, float axh_id)
+void UpdateAuxiliaryXhair(entity own, vector loc, vector clr, int axh_id)
 {
     if (!IS_REAL_CLIENT(own))
         return;
@@ -860,16 +869,16 @@ void vehicles_exit(float eject)
 
 void vehicles_regen(float timer, .float regen_field, float field_max, float rpause, float regen, float delta_time, float _healthscale)
 {
-    if(self.regen_field < field_max)
-    if(timer + rpause < time)
+    if (self.(regen_field) < field_max)
+    if (timer + rpause < time)
     {
-        if(_healthscale)
+        if (_healthscale)
             regen = regen * (self.vehicle_health / self.tur_health);
 
-        self.regen_field = min(self.regen_field + regen * delta_time, field_max);
+        self.(regen_field) = min(self.(regen_field) + regen * delta_time, field_max);
 
-        if(self.owner)
-            self.owner.regen_field = (self.regen_field / field_max) * 100;
+        if (self.owner)
+            self.owner.(regen_field) = (self.(regen_field) / field_max) * 100;
     }
 }