X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fsv_vehicles.qc;fp=qcsrc%2Fcommon%2Fvehicles%2Fsv_vehicles.qc;h=d5bba034fc8260362900c80b00715d624b363ac6;hp=bcfbf88752b4324ed15c914c66dddf278ebf6c84;hb=591137cbf2cbf263945e89a1421887b0a3d82a3a;hpb=f80494c16cf9d95def0142b6c5d7146baa1ea9e2

diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index bcfbf88752..d5bba034fc 100644
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -104,7 +104,7 @@ void vehicles_locktarget(float incr, float decr, float _lock_time)
 		if(!((trace_ent.vehicle_flags & VHF_ISVEHICLE) || (trace_ent.turrcaps_flags & TFL_TURRCAPS_ISTURRET)))
 			trace_ent = world;
 
-		if(trace_ent.alpha <= 0.5 && trace_ent.alpha)
+		if(trace_ent.alpha <= 0.5 && trace_ent.alpha != 0)
 			trace_ent = world; // invisible
 	}
 
@@ -209,7 +209,7 @@ void vehicles_projectile_explode()
 	PROJECTILE_TOUCH;
 
 	self.event_damage = func_null;
-	RadiusDamage (self, self.realowner, self.shot_dmg, 0, self.shot_radius, self, self.shot_force, self.totalfrags, other);
+	RadiusDamage (self, self.realowner, self.shot_dmg, 0, self.shot_radius, self, world, self.shot_force, self.totalfrags, other);
 
 	remove (self);
 }
@@ -617,17 +617,18 @@ void vehicles_damage(entity inflictor, entity attacker, float damage, float deat
 {
 	self.dmg_time = time;
 
-	if(DEATH_ISWEAPON(deathtype, WEP_NEX))
-		damage *= autocvar_g_vehicles_nex_damagerate;
+	// WEAPONTODO
+	if(DEATH_ISWEAPON(deathtype, WEP_VORTEX))
+		damage *= autocvar_g_vehicles_vortex_damagerate;
 
-	if(DEATH_ISWEAPON(deathtype, WEP_UZI))
-		damage *= autocvar_g_vehicles_uzi_damagerate;
+	if(DEATH_ISWEAPON(deathtype, WEP_MACHINEGUN))
+		damage *= autocvar_g_vehicles_machinegun_damagerate;
 
 	if(DEATH_ISWEAPON(deathtype, WEP_RIFLE))
 		damage *= autocvar_g_vehicles_rifle_damagerate;
 
-	if(DEATH_ISWEAPON(deathtype, WEP_MINSTANEX))
-		damage *= autocvar_g_vehicles_minstanex_damagerate;
+	if(DEATH_ISWEAPON(deathtype, WEP_VAPORIZER))
+		damage *= autocvar_g_vehicles_vaporizer_damagerate;
 
 	if(DEATH_ISWEAPON(deathtype, WEP_SEEKER))
 		damage *= autocvar_g_vehicles_tag_damagerate;