Kill get_vehicleinfo

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

diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index 53ed9bf4cc682f0111088d99d02ec18b07042b3e..78a0dbc1f4acc29dd206dd5aff124f307ef28588 100644 (file)
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -737,7 +737,7 @@ void vehicles_damage(entity inflictor, entity attacker, float damage, int deatht
 
                antilag_clear(self);
 
-               Vehicle info = get_vehicleinfo(self.vehicleid);
+               Vehicle info = Vehicles_from(self.vehicleid);
                info.vr_death(info);
                vehicles_setreturn(self);
        }
@@ -944,7 +944,7 @@ void vehicles_touch()
                }
 
                if(self.play_time < time) {
-                       Vehicle info = get_vehicleinfo(self.vehicleid);
+                       Vehicle info = Vehicles_from(self.vehicleid);
                        info.vr_impact(info);
                }
 
@@ -1118,7 +1118,7 @@ void vehicles_enter(entity pl, entity veh)
 
        setself(veh);
        CSQCModel_UnlinkEntity(veh);
-       Vehicle info = get_vehicleinfo(veh.vehicleid);
+       Vehicle info = Vehicles_from(veh.vehicleid);
        info.vr_enter(info);
        setself(this);
 
@@ -1132,7 +1132,7 @@ void vehicles_think()
        if(self.owner)
                self.owner.vehicle_weapon2mode = self.vehicle_weapon2mode;
 
-       Vehicle info = get_vehicleinfo(self.vehicleid);
+       Vehicle info = Vehicles_from(self.vehicleid);
        info.vr_think(info);
 
        vehicles_painframe(self);
@@ -1183,7 +1183,7 @@ void vehicles_spawn()
 
        vehicles_reset_colors();
 
-       Vehicle info = get_vehicleinfo(self.vehicleid);
+       Vehicle info = Vehicles_from(self.vehicleid);
        info.vr_spawn(info);
 
        CSQCMODEL_AUTOINIT(self);
@@ -1198,7 +1198,7 @@ bool vehicle_initialize(entity veh, bool nodrop)
                return false;
 
        if(!veh.tur_head) {
-               Vehicle info = get_vehicleinfo(veh.vehicleid);
+               Vehicle info = Vehicles_from(veh.vehicleid);
                info.vr_precache(info);
        }
 
@@ -1293,7 +1293,7 @@ bool vehicle_initialize(entity veh, bool nodrop)
        self.pos2 = self.angles;
        self.tur_head.team = self.team;
 
-       Vehicle info = get_vehicleinfo(veh.vehicleid);
+       Vehicle info = Vehicles_from(veh.vehicleid);
        info.vr_setup(info);
 
        if(self.active == ACTIVE_NOT)