X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fsv_vehicles.qc;h=fc44613e5d111cbafd02f69700f9552b09fb7678;hb=42e255d014f2c6a1871177ea511f630624cdfb57;hp=f99d7622f5a500dae872c2f8ef283bc3f45c002d;hpb=0f8553d27e17cc90ccbdd7d56d86bb5136330db7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index f99d7622f..fc44613e5 100644
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -208,7 +208,7 @@ void vehicles_projectile_damage(entity this, entity inflictor, entity attacker,
 	{
 		this.takedamage = DAMAGE_NO;
 		this.event_damage = func_null;
-		this.think = this.use;
+		this.think = adaptor_think2use;
 		this.nextthink = time;
 	}
 }
@@ -232,6 +232,11 @@ void vehicles_projectile_explode()
 	remove (self);
 }
 
+void vehicles_projectile_explode_use(entity this, entity actor, entity trigger)
+{
+	WITHSELF(this, vehicles_projectile_explode());
+}
+
 entity vehicles_projectile(entity this, string _mzlfx, Sound _mzlsound,
 						   vector _org, vector _vel,
 						   float _dmg, float _radi, float _force,  float _size,
@@ -257,7 +262,7 @@ entity vehicles_projectile(entity this, string _mzlfx, Sound _mzlsound,
 	proj.bot_dodgerating  = _dmg;
 	proj.velocity		 = _vel;
 	proj.touch			= vehicles_projectile_explode;
-	proj.use			  = vehicles_projectile_explode;
+	proj.use			  = vehicles_projectile_explode_use;
 	proj.owner			= this;
 	proj.realowner		= _owner;
 	proj.think			= SUB_Remove_self;
@@ -541,29 +546,29 @@ void vehicles_setreturn(entity veh)
 
 }
 
-void vehicle_use()
-{SELFPARAM();
-	LOG_TRACE("vehicle ",self.netname, " used by ", activator.classname, "\n");
+void vehicle_use(entity this, entity actor, entity trigger)
+{
+	LOG_TRACE("vehicle ",this.netname, " used by ", actor.classname, "\n");
 
-	self.tur_head.team = activator.team;
+	this.tur_head.team = actor.team;
 
-	if(self.tur_head.team == 0)
-		self.active = ACTIVE_NOT;
+	if(this.tur_head.team == 0)
+		this.active = ACTIVE_NOT;
 	else
-		self.active = ACTIVE_ACTIVE;
+		this.active = ACTIVE_ACTIVE;
 
-	if(self.active == ACTIVE_ACTIVE && !IS_DEAD(self) && !gameover)
+	if(this.active == ACTIVE_ACTIVE && !IS_DEAD(this) && !gameover)
 	{
-		LOG_TRACE("Respawning vehicle: ", self.netname, "\n");
-		if(self.effects & EF_NODRAW)
+		LOG_TRACE("Respawning vehicle: ", this.netname, "\n");
+		if(this.effects & EF_NODRAW)
 		{
-			self.think = vehicles_spawn;
-			self.nextthink = time + 3;
+			this.think = vehicles_spawn;
+			this.nextthink = time + 3;
 		}
 		else
 		{
-			vehicles_setreturn(self);
-			vehicles_reset_colors(self);
+			vehicles_setreturn(this);
+			vehicles_reset_colors(this);
 		}
 	}
 }
@@ -953,6 +958,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 +1170,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);