From: terencehill Date: Fri, 21 Jun 2013 13:30:43 +0000 (+0200) Subject: Make racer_blowup() similar to raptor_blowup(): don't override respawn time (already... X-Git-Tag: xonotic-v0.8.0~243^2^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=068dec54a05e69fb6586ab1ca9ececed81146ba9;p=xonotic%2Fxonotic-data.pk3dir.git Make racer_blowup() similar to raptor_blowup(): don't override respawn time (already correctly calculated in vehicles.qc) and don't call racer_spawn as it isn't necessary. --- diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc index 43c73c249..79ea2ab5e 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) { @@ -544,16 +543,16 @@ void racer_blowup() 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() {