Merge branch 'master' into terencehill/translate_colors_2

[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 f99d7622f5a500dae872c2f8ef283bc3f45c002d..35b6c677f957de6fbfe84ee53ad28a78ce4aa3e7 100644 (file)
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -953,6 +953,7 @@ bool vehicle_impulse(entity this, int imp)
 
 void vehicles_enter(entity pl, entity veh)
 {
+    SELFPARAM();
        entity oldself = self;
 
    // Remove this when bots know how to use vehicles
@@ -1164,6 +1165,9 @@ bool vehicle_initialize(entity this, Vehicle info, bool nodrop)
        if(!info.vehicleid)
                return false;
 
+       if(!this.tur_head)
+               info.vr_precache(info);
+
        if(this.targetname && this.targetname != "")
        {
                this.vehicle_controller = find(world, target, this.targetname);