From: Rudolf Polzer Date: Wed, 26 May 2010 22:25:12 +0000 (+0200) Subject: properly set the HITTYPE_BOUNCE flag on all timeout detonations X-Git-Tag: xonotic-v0.1.0preview~570^2~1 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=072057284763e97d4978beda49de57c80dfbcd8e properly set the HITTYPE_BOUNCE flag on all timeout detonations --- diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index 06ff588578..638e18bcc2 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -56,7 +56,7 @@ void W_Hagar_Attack (void) missile.bot_dodgerating = cvar("g_balance_hagar_primary_damage"); missile.touch = W_Hagar_Touch; missile.use = W_Hagar_Explode; - missile.think = adaptor_think2use; + missile.think = adaptor_think2use_hittype_splash; missile.nextthink = time + cvar("g_balance_hagar_primary_lifetime"); PROJECTILE_MAKETRIGGER(missile); missile.projectiledeathtype = WEP_HAGAR; @@ -91,7 +91,7 @@ void W_Hagar_Attack2 (void) missile.touch = W_Hagar_Touch2; missile.cnt = 0; missile.use = W_Hagar_Explode2; - missile.think = adaptor_think2use; + missile.think = adaptor_think2use_hittype_splash; missile.nextthink = time + cvar("g_balance_hagar_secondary_lifetime_min") + random() * cvar("g_balance_hagar_secondary_lifetime_rand"); PROJECTILE_MAKETRIGGER(missile); missile.projectiledeathtype = WEP_HAGAR | HITTYPE_SECONDARY; diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc index 6b2270af2f..7b4eba094d 100644 --- a/qcsrc/server/w_hook.qc +++ b/qcsrc/server/w_hook.qc @@ -77,7 +77,7 @@ void W_Hook_Attack2() setsize(gren, '0 0 0', '0 0 0'); gren.nextthink = time + cvar("g_balance_hook_secondary_lifetime"); - gren.think = adaptor_think2use; + gren.think = adaptor_think2use_hittype_splash; gren.use = W_Hook_Explode2; gren.touch = W_Hook_Touch2; diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index 691a25251a..83d615884c 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -28,7 +28,10 @@ void Seeker_Missile_Think() float dist; if (time > self.cnt) + { + self.projectiledeathtype |= HITTYPE_SPLASH; Seeker_Missile_Explode(); + } if (!self.switchweapon) self.switchweapon = cvar("g_balance_seeker_missile_speed"); @@ -404,7 +407,7 @@ void Seeker_Fire_Flac() missile.bot_dodgerating = cvar("g_balance_seeker_flac_damage"); missile.touch = Seeker_Flac_Explode; missile.use = Seeker_Flac_Explode; - missile.think = Seeker_Flac_Explode; + missile.think = adaptor_think2use_hittype_splash; missile.nextthink = time + cvar("g_balance_seeker_flac_lifetime") + cvar("g_balance_seeker_flac_lifetime_rand"); missile.solid = SOLID_BBOX; missile.scale = 0.4; // BUG: the model is too big