X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_rocketlauncher.qc;h=35ca569777f4cce38f988bcb93ad9671352fcac6;hb=6e721075bc3bc04f1b3b43d50ad74ed3de177fd8;hp=f6975b3b6a0d13d6903830adc2526c8c9940110f;hpb=a598006dd0a4de3772e7f3a9dc791576c957bc0e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index f6975b3b6..35ca56977 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -544,17 +544,6 @@ float w_rlauncher(float req) } else if (req == WR_CHECKAMMO2) return FALSE; - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "exploded"; - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation) - w_deathtypestring = "got too close to #'s rocket"; - else if(w_deathtype & HITTYPE_SPLASH) - w_deathtypestring = "almost dodged #'s rocket"; - else - w_deathtypestring = "ate #'s rocket"; - } else if (req == WR_RESETPLAYER) { self.rl_release = 0; @@ -577,6 +566,17 @@ float w_rlauncher(float req) { precache_sound("weapons/rocket_impact.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "exploded"; + else if (req == WR_KILLMESSAGE) + { + if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation) + w_deathtypestring = "got too close to #'s rocket"; + else if(w_deathtype & HITTYPE_SPLASH) + w_deathtypestring = "almost dodged #'s rocket"; + else + w_deathtypestring = "ate #'s rocket"; + } return TRUE; } #endif