X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fvehicles%2Fracer.qc;h=fc9cee8657f97e58af04c999e87f3d80e6358052;hb=71e6c75bc408ae5a116f296797c49c0cef7be113;hp=ff54539027eaa8cebb27d1f45caa6101a11e6046;hpb=3b2bc1bdee04f4c454279bf14ac8ed6b37c6ddb5;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index ff5453902..fc9cee865 100644 --- a/qcsrc/server/vehicles/racer.qc +++ b/qcsrc/server/vehicles/racer.qc @@ -74,7 +74,6 @@ float autocvar_g_vehicle_racer_bouncestop; vector autocvar_g_vehicle_racer_bouncepain; var vector racer_force_from_tag(string tag_name, float spring_length, float max_power); -void racer_spawn_default(); void racer_align4point(float _delta) { @@ -529,8 +528,8 @@ void racer_exit(float eject) void racer_impact() { - if(autocvar_g_vehicle_racer_bouncepain_x) - vehilces_impact(autocvar_g_vehicle_racer_bouncepain_x, autocvar_g_vehicle_racer_bouncepain_y, autocvar_g_vehicle_racer_bouncepain_z); + if(autocvar_g_vehicle_racer_bouncepain_x) + vehicles_impact(autocvar_g_vehicle_racer_bouncepain_x, autocvar_g_vehicle_racer_bouncepain_y, autocvar_g_vehicle_racer_bouncepain_z); } void racer_blowup() @@ -540,20 +539,20 @@ void racer_blowup() RadiusDamage (self, self.enemy, autocvar_g_vehicle_racer_blowup_coredamage, autocvar_g_vehicle_racer_blowup_edgedamage, - autocvar_g_vehicle_racer_blowup_radius, world, + autocvar_g_vehicle_racer_blowup_radius, world, world, autocvar_g_vehicle_racer_blowup_forceintensity, DEATH_VH_WAKI_DEATH, world); - self.nextthink = time + autocvar_g_vehicle_racer_respawntime; - self.think = racer_spawn_default; + self.alpha = -1; self.movetype = MOVETYPE_NONE; self.effects = EF_NODRAW; - self.colormod = '0 0 0'; self.avelocity = '0 0 0'; self.velocity = '0 0 0'; setorigin(self, self.pos1); + self.touch = func_null; + self.nextthink = 0; } void racer_deadtouch() @@ -624,12 +623,6 @@ void racer_spawn(float _spawnflag) self.damageforcescale = 0.5; //self.destvec = autocvar_g_vehicle_racer_bouncepain; } -void racer_spawn_default() -{ - racer_spawn(0); -} - - void spawnfunc_vehicle_racer() {