From: FruitieX Date: Tue, 8 Jun 2010 14:42:33 +0000 (+0300) Subject: all weapons supported. thanks div0 X-Git-Tag: xonotic-v0.1.0preview~541^2~100 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=55d5f004b38c1e911afa6ae0b244ae70b7c3fdab;p=xonotic%2Fxonotic-data.pk3dir.git all weapons supported. thanks div0 --- diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc index 2df3e084c..80bd84a07 100644 --- a/qcsrc/client/Defs.qc +++ b/qcsrc/client/Defs.qc @@ -248,3 +248,11 @@ float ticrate; // only for Porto float angles_held_status; vector angles_held; + +// weapons +.float silent; + +float w_deathtype, w_issilent, w_random; +string w_deathtypestring; +vector w_org, w_backoff; + diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc index 1b0138f36..24c5f0153 100644 --- a/qcsrc/client/damage.qc +++ b/qcsrc/client/damage.qc @@ -1,8 +1,3 @@ -.float silent; - -float w_deathtype, w_issilent, w_random; -vector w_org, w_backoff; - void Ent_DamageInfo(float isNew) { float dmg, rad, edge, thisdmg, forcemul; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index daf257d47..df420d884 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2001,47 +2001,16 @@ void HUD_HealthArmor(void) string Weapon_SuicideMessage(float deathtype) { - float w; - w = DEATH_WEAPONOF(deathtype); - - switch (w) - { - case 1: - return "lasered himself to hell"; - case 2: - return "did the impossible"; - case 3: - return "did the impossible"; - case 4: - if(deathtype & HITTYPE_SECONDARY) - return "tried out his own grenade"; - return "detonated"; - } - // TODO: was blasted by? - return strcat("[no kill message for weapon ", ftos(w), "!]"); + w_deathtype = deathtype; + get_weaponinfo(DEATH_WEAPONOF(deathtype)).weapon_func(WR_SUICIDEMESSAGE); + return w_deathtypestring; } string Weapon_KillMessage(float deathtype) { - float w; - w = DEATH_WEAPONOF(deathtype); - - switch (w) - { - case 1: - return "was lasered to death by"; - case 2: - return "was gunned by"; - case 3: - if(deathtype & HITTYPE_SECONDARY) - return "was sniped by"; - return "was riddled full of holes by"; - case 4: - if(deathtype & HITTYPE_BOUNCE) - return "didn't see #'s grenade"; - return "almost dodged #'s grenade"; - } - return strcat("[no suicide message for weapon ", ftos(w), "!]"); + w_deathtype = deathtype; + get_weaponinfo(DEATH_WEAPONOF(deathtype)).weapon_func(WR_KILLMESSAGE); + return w_deathtypestring; } float killnotify_times[10]; diff --git a/qcsrc/server/w_campingrifle.qc b/qcsrc/server/w_campingrifle.qc index c3c9d52f9..8fc8d839d 100644 --- a/qcsrc/server/w_campingrifle.qc +++ b/qcsrc/server/w_campingrifle.qc @@ -250,38 +250,6 @@ float w_campingrifle(float req) return self.ammo_nails >= cvar("g_balance_campingrifle_primary_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_nails >= cvar("g_balance_campingrifle_secondary_ammo"); - else if (req == WR_SUICIDEMESSAGE) - { - if(w_deathtype & HITTYPE_SECONDARY) - w_deathtypestring = "shot themself automatically"; - else - w_deathtypestring = "sniped themself somehow"; - } - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_SECONDARY) - { - if(w_deathtype & HITTYPE_BOUNCE) - w_deathtypestring = "failed to hide from #'s bullet hail"; - else - w_deathtypestring = "died in #'s bullet hail"; - } - else - { - if(w_deathtype & HITTYPE_BOUNCE) - { - // TODO special headshot message here too? - w_deathtypestring = "failed to hide from #'s rifle"; - } - else - { - if(w_deathtype & HITTYPE_HEADSHOT) - w_deathtypestring = "got hit in the head by #"; - else - w_deathtypestring = "was sniped by #"; - } - } - } else if (req == WR_RELOAD) { W_CampingRifle_Reload(); @@ -319,6 +287,38 @@ float w_campingrifle(float req) precache_sound("weapons/ric2.wav"); precache_sound("weapons/ric3.wav"); } + else if (req == WR_SUICIDEMESSAGE) + { + if(w_deathtype & HITTYPE_SECONDARY) + w_deathtypestring = "shot themself automatically"; + else + w_deathtypestring = "sniped themself somehow"; + } + else if (req == WR_KILLMESSAGE) + { + if(w_deathtype & HITTYPE_SECONDARY) + { + if(w_deathtype & HITTYPE_BOUNCE) + w_deathtypestring = "failed to hide from #'s bullet hail"; + else + w_deathtypestring = "died in #'s bullet hail"; + } + else + { + if(w_deathtype & HITTYPE_BOUNCE) + { + // TODO special headshot message here too? + w_deathtypestring = "failed to hide from #'s rifle"; + } + else + { + if(w_deathtype & HITTYPE_HEADSHOT) + w_deathtypestring = "got hit in the head by #"; + else + w_deathtypestring = "was sniped by #"; + } + } + } return TRUE; } #endif diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 7f6062d3f..d80317a34 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -220,19 +220,6 @@ float w_crylink(float req) return self.ammo_cells >= cvar("g_balance_crylink_primary_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_cells >= cvar("g_balance_crylink_secondary_ammo"); - else if (req == WR_SUICIDEMESSAGE) - { - w_deathtypestring = "succeeded at self-destructing themself with the Crylink"; - } - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_BOUNCE) - w_deathtypestring = "could not hide from #'s Crylink"; // unchecked: SPLASH (SECONDARY can't be) - else if(w_deathtype & HITTYPE_SPLASH) - w_deathtypestring = "was too close to #'s Crylink"; // unchecked: SECONDARY - else - w_deathtypestring = "took a close look at #'s Crylink"; // unchecked: SECONDARY - } return TRUE; }; #endif @@ -261,6 +248,19 @@ float w_crylink(float req) precache_sound("weapons/crylink_impact2.wav"); precache_sound("weapons/crylink_impact.wav"); } + else if (req == WR_SUICIDEMESSAGE) + { + w_deathtypestring = "succeeded at self-destructing themself with the Crylink"; + } + else if (req == WR_KILLMESSAGE) + { + if(w_deathtype & HITTYPE_BOUNCE) + w_deathtypestring = "could not hide from #'s Crylink"; // unchecked: SPLASH (SECONDARY can't be) + else if(w_deathtype & HITTYPE_SPLASH) + w_deathtypestring = "was too close to #'s Crylink"; // unchecked: SECONDARY + else + w_deathtypestring = "took a close look at #'s Crylink"; // unchecked: SECONDARY + } return TRUE; } #endif diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 45168cdac..0b35eae66 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -285,32 +285,6 @@ float w_electro(float req) return self.ammo_cells >= cvar("g_balance_electro_primary_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_cells >= cvar("g_balance_electro_secondary_ammo"); - else if (req == WR_SUICIDEMESSAGE) - { - if(w_deathtype & HITTYPE_SECONDARY) - w_deathtypestring = "could not remember where they put plasma"; - else - w_deathtypestring = "played with plasma"; - } - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_SECONDARY) - { - if(w_deathtype & HITTYPE_SPLASH) // unchecked: BOUNCE - w_deathtypestring = "just noticed #'s blue ball"; - else // unchecked: BOUNCE - w_deathtypestring = "got in touch with #'s blue ball"; - } - else - { - if(w_deathtype & HITTYPE_BOUNCE) // combo - w_deathtypestring = "felt the electrifying air of #'s combo"; - else if(w_deathtype & HITTYPE_SPLASH) - w_deathtypestring = "got too close to #'s blue beam"; - else - w_deathtypestring = "was blasted by #'s blue beam"; - } - } else if (req == WR_RESETPLAYER) { self.electro_secondarytime = time; @@ -353,6 +327,32 @@ float w_electro(float req) precache_sound("weapons/electro_impact.wav"); precache_sound("weapons/electro_impact_combo.wav"); } + else if (req == WR_SUICIDEMESSAGE) + { + if(w_deathtype & HITTYPE_SECONDARY) + w_deathtypestring = "could not remember where they put plasma"; + else + w_deathtypestring = "played with plasma"; + } + else if (req == WR_KILLMESSAGE) + { + if(w_deathtype & HITTYPE_SECONDARY) + { + if(w_deathtype & HITTYPE_SPLASH) // unchecked: BOUNCE + w_deathtypestring = "just noticed #'s blue ball"; + else // unchecked: BOUNCE + w_deathtypestring = "got in touch with #'s blue ball"; + } + else + { + if(w_deathtype & HITTYPE_BOUNCE) // combo + w_deathtypestring = "felt the electrifying air of #'s combo"; + else if(w_deathtype & HITTYPE_SPLASH) + w_deathtypestring = "got too close to #'s blue beam"; + else + w_deathtypestring = "was blasted by #'s blue beam"; + } + } return TRUE; } #endif diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc index d5c0b13f9..278099c63 100644 --- a/qcsrc/server/w_fireball.qc +++ b/qcsrc/server/w_fireball.qc @@ -351,6 +351,36 @@ float w_fireball(float req) return self.ammo_fuel >= cvar("g_balance_fireball_primary_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_fuel >= cvar("g_balance_fireball_secondary_ammo"); + else if (req == WR_RESETPLAYER) + { + self.fireball_primarytime = time; + } + return TRUE; +}; +#endif +#ifdef CSQC +float w_fireball(float req) +{ + if(req == WR_IMPACTEFFECT) + { + vector org2; + if(w_deathtype & HITTYPE_SECONDARY) + { + // firemine goes out silently + } + else + { + org2 = w_org + w_backoff * 16; + pointparticles(particleeffectnum("fireball_explode"), org2, '0 0 0', 1); + if(!w_issilent) + sound(self, CHAN_PROJECTILE, "weapons/fireball_impact2.wav", VOL_BASE, ATTN_NORM * 0.25); // long range boom + } + } + else if(req == WR_PRECACHE) + { + precache_sound("weapons/fireball_impact.wav"); + precache_sound("weapons/fireball_impact2.wav"); + } else if (req == WR_SUICIDEMESSAGE) { if(w_deathtype & HITTYPE_SECONDARY) @@ -386,36 +416,6 @@ float w_fireball(float req) w_deathtypestring = "tasted #'s fireball"; } } - else if (req == WR_RESETPLAYER) - { - self.fireball_primarytime = time; - } - return TRUE; -}; -#endif -#ifdef CSQC -float w_fireball(float req) -{ - if(req == WR_IMPACTEFFECT) - { - vector org2; - if(w_deathtype & HITTYPE_SECONDARY) - { - // firemine goes out silently - } - else - { - org2 = w_org + w_backoff * 16; - pointparticles(particleeffectnum("fireball_explode"), org2, '0 0 0', 1); - if(!w_issilent) - sound(self, CHAN_PROJECTILE, "weapons/fireball_impact2.wav", VOL_BASE, ATTN_NORM * 0.25); // long range boom - } - } - else if(req == WR_PRECACHE) - { - precache_sound("weapons/fireball_impact.wav"); - precache_sound("weapons/fireball_impact2.wav"); - } return TRUE; } #endif diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index b340f76c9..a7d9a4935 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -217,23 +217,6 @@ float w_glauncher(float req) return self.ammo_rockets >= cvar("g_balance_grenadelauncher_primary_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_rockets >= cvar("g_balance_grenadelauncher_secondary_ammo"); - else if (req == WR_SUICIDEMESSAGE) - { - if(w_deathtype & HITTYPE_SECONDARY) - w_deathtypestring = "tried out his own grenade"; - else - w_deathtypestring = "detonated"; - } - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_SPLASH) - if(w_deathtype & HITTYPE_BOUNCE) // (must be secondary then) - w_deathtypestring = "didn't see #'s grenade"; - else // unchecked: SECONDARY - w_deathtypestring = "almost dodged #'s grenade"; - else // unchecked: SECONDARY, BOUNCE - w_deathtypestring = "ate #'s grenade"; - } return TRUE; }; #endif @@ -252,6 +235,23 @@ float w_glauncher(float req) { precache_sound("weapons/grenade_impact.wav"); } + else if (req == WR_SUICIDEMESSAGE) + { + if(w_deathtype & HITTYPE_SECONDARY) + w_deathtypestring = "tried out his own grenade"; + else + w_deathtypestring = "detonated"; + } + else if (req == WR_KILLMESSAGE) + { + if(w_deathtype & HITTYPE_SPLASH) + if(w_deathtype & HITTYPE_BOUNCE) // (must be secondary then) + w_deathtypestring = "didn't see #'s grenade"; + else // unchecked: SECONDARY + w_deathtypestring = "almost dodged #'s grenade"; + else // unchecked: SECONDARY, BOUNCE + w_deathtypestring = "ate #'s grenade"; + } return TRUE; } #endif diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index c95a90e5d..d37235736 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -151,15 +151,6 @@ float w_hagar(float req) return self.ammo_rockets >= cvar("g_balance_hagar_primary_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_rockets >= cvar("g_balance_hagar_secondary_ammo"); - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "played with tiny rockets"; - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH - w_deathtypestring = "hoped #'s missiles wouldn't bounce"; - else // unchecked: SPLASH, SECONDARY - w_deathtypestring = "was pummeled by"; - } return TRUE; }; #endif @@ -187,6 +178,15 @@ float w_hagar(float req) precache_sound("weapons/hagexp2.wav"); precache_sound("weapons/hagexp3.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "played with tiny rockets"; + else if (req == WR_KILLMESSAGE) + { + if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH + w_deathtypestring = "hoped #'s missiles wouldn't bounce"; + else // unchecked: SPLASH, SECONDARY + w_deathtypestring = "was pummeled by"; + } return TRUE; } #endif diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc index 5fe75ab2c..88990de62 100644 --- a/qcsrc/server/w_hlac.qc +++ b/qcsrc/server/w_hlac.qc @@ -207,10 +207,6 @@ float w_hlac(float req) return self.ammo_cells >= cvar("g_balance_hlac_primary_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_cells >= cvar("g_balance_hlac_secondary_ammo"); - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "should have used a smaller gun"; - else if (req == WR_KILLMESSAGE) - w_deathtypestring = "was cut down by"; return TRUE; }; #endif @@ -229,6 +225,10 @@ float w_hlac(float req) { precache_sound("weapons/laserimpact.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "should have used a smaller gun"; + else if (req == WR_KILLMESSAGE) + w_deathtypestring = "was cut down by"; return TRUE; } #endif diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc index 9e5868355..c8d1369f7 100644 --- a/qcsrc/server/w_hook.qc +++ b/qcsrc/server/w_hook.qc @@ -239,10 +239,6 @@ float w_hook(float req) { return self.ammo_cells >= cvar("g_balance_hook_secondary_ammo"); } - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "did the impossible"; - else if (req == WR_KILLMESSAGE) - w_deathtypestring = "has run into #'s gravity bomb"; else if (req == WR_RESETPLAYER) { self.hook_refire = time; @@ -265,6 +261,10 @@ float w_hook(float req) { precache_sound("weapons/hookbomb_impact.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "did the impossible"; + else if (req == WR_KILLMESSAGE) + w_deathtypestring = "has run into #'s gravity bomb"; return TRUE; } #endif diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index a17f2a4c5..cdfdaa537 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -178,12 +178,6 @@ float w_laser(float req) return TRUE; else if (req == WR_CHECKAMMO2) return TRUE; - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "lasered themself to hell"; - else if (req == WR_KILLMESSAGE) - { - w_deathtypestring = "was lasered to death by"; // unchecked: SPLASH - } return TRUE; }; #endif @@ -202,6 +196,12 @@ float w_laser(float req) { precache_sound("weapons/laserimpact.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "lasered themself to hell"; + else if (req == WR_KILLMESSAGE) + { + w_deathtypestring = "was lasered to death by"; // unchecked: SPLASH + } return TRUE; } #endif diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index f28c8581c..65d02dcb2 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -232,10 +232,6 @@ float w_minstanex(float req) } else if (req == WR_CHECKAMMO2) return TRUE; - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "did the impossible"; - else if (req == WR_KILLMESSAGE) - w_deathtypestring = "has been vaporized by"; else if (req == WR_RESETPLAYER) { self.minstanex_lasthit = 0; @@ -258,6 +254,10 @@ float w_minstanex(float req) { precache_sound("weapons/neximpact.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "did the impossible"; + else if (req == WR_KILLMESSAGE) + w_deathtypestring = "has been vaporized by"; return TRUE; } #endif diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index c23a47b5d..4c30f4c67 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -74,10 +74,6 @@ float w_nex(float req) return self.ammo_cells >= cvar("g_balance_nex_ammo"); else if (req == WR_CHECKAMMO2) return FALSE; - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "did the impossible"; - else if (req == WR_KILLMESSAGE) - w_deathtypestring = "has been vaporized by"; return TRUE; }; #endif @@ -96,6 +92,10 @@ float w_nex(float req) { precache_sound("weapons/neximpact.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "did the impossible"; + else if (req == WR_KILLMESSAGE) + w_deathtypestring = "has been vaporized by"; return TRUE; } #endif diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc index 1ab117885..b78e85574 100644 --- a/qcsrc/server/w_porto.qc +++ b/qcsrc/server/w_porto.qc @@ -269,10 +269,6 @@ float w_porto(float req) } else if (req == WR_SETUP) weapon_setup(WEP_PORTO); - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "did the impossible"; - else if (req == WR_KILLMESSAGE) - w_deathtypestring = "felt # doing the impossible to him"; else if (req == WR_RESETPLAYER) { self.porto_current = world; @@ -291,6 +287,10 @@ float w_porto(float req) { // nothing to do } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "did the impossible"; + else if (req == WR_KILLMESSAGE) + w_deathtypestring = "felt # doing the impossible to him"; return TRUE; } #endif 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 diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index 512eb28e8..c347648df 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -140,12 +140,6 @@ float w_shotgun(float req) return self.ammo_shells >= cvar("g_balance_shotgun_primary_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_shells >= cvar("g_balance_shotgun_secondary_ammo") * 3; - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "did the impossible"; - else if (req == WR_KILLMESSAGE) - { - w_deathtypestring = "was gunned by"; // unchecked: SECONDARY - } return TRUE; }; #endif @@ -173,6 +167,12 @@ float w_shotgun(float req) precache_sound("weapons/ric2.wav"); precache_sound("weapons/ric3.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "did the impossible"; + else if (req == WR_KILLMESSAGE) + { + w_deathtypestring = "was gunned by"; // unchecked: SECONDARY + } return TRUE; } #endif diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc index f3b916491..243b32b20 100644 --- a/qcsrc/server/w_tuba.qc +++ b/qcsrc/server/w_tuba.qc @@ -241,14 +241,6 @@ float w_tuba(float req) return TRUE; // TODO use fuel? else if (req == WR_CHECKAMMO2) return TRUE; // TODO use fuel? - else if (req == WR_SUICIDEMESSAGE) - { - w_deathtypestring = "hurt his own ears with the @!#%'n Tuba"; - } - else if (req == WR_KILLMESSAGE) - { - w_deathtypestring = "died of #'s great playing on the @!#%'n Tuba"; - } return TRUE; }; #endif @@ -263,6 +255,14 @@ float w_tuba(float req) { // nothing to do } + else if (req == WR_SUICIDEMESSAGE) + { + w_deathtypestring = "hurt his own ears with the @!#%'n Tuba"; + } + else if (req == WR_KILLMESSAGE) + { + w_deathtypestring = "died of #'s great playing on the @!#%'n Tuba"; + } return TRUE; } #endif diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc index 5879b00b8..245ad652f 100644 --- a/qcsrc/server/w_uzi.qc +++ b/qcsrc/server/w_uzi.qc @@ -126,15 +126,6 @@ float w_uzi(float req) return self.ammo_nails >= cvar("g_balance_uzi_first_ammo"); else if (req == WR_CHECKAMMO2) return self.ammo_nails >= cvar("g_balance_uzi_first_ammo"); - else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "did the impossible"; - else if (req == WR_KILLMESSAGE) - { - if(w_deathtype & HITTYPE_SECONDARY) - w_deathtypestring = "was sniped by"; - else - w_deathtypestring = "was riddled full of holes by"; - } return TRUE; }; #endif @@ -160,6 +151,15 @@ float w_uzi(float req) precache_sound("weapons/ric2.wav"); precache_sound("weapons/ric3.wav"); } + else if (req == WR_SUICIDEMESSAGE) + w_deathtypestring = "did the impossible"; + else if (req == WR_KILLMESSAGE) + { + if(w_deathtype & HITTYPE_SECONDARY) + w_deathtypestring = "was sniped by"; + else + w_deathtypestring = "was riddled full of holes by"; + } return TRUE; } #endif