From 7be1d49d63370b86c0f1e1bcfb661f4f32b4bdfd Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 10 Jul 2010 14:02:39 +0200 Subject: [PATCH] Fix some typo. Remove assignments of itemid and weaponid as they are unnecessary (see code). --- qcsrc/server/cheats.qc | 2 +- qcsrc/server/cl_client.qc | 1 - qcsrc/server/t_items.qc | 12 ++---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 6ef8267944..a75537907d 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -653,7 +653,7 @@ float CheatCommand(float argc) if(self.movetype != MOVETYPE_FLY) { self.movetype = MOVETYPE_FLY; - sprint(self, "flmodey ON\n"); + sprint(self, "flymode ON\n"); DID_CHEAT(); } else diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 73c9169e5e..08c53c1940 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -2659,7 +2659,6 @@ void PlayerPreThink (void) FOR_EACH_PLAYER(other) if(self != other) { if(time > other.touchexplode_time) - if(other.classname == "player") if(other.deadflag == DEAD_NO) if not(IS_INDEPENDENT_PLAYER(other)) if(boxesoverlap(self.absmin, self.absmax, other.absmin, other.absmax)) diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index cb8f0b1025..6f3347b5e5 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -291,7 +291,7 @@ float Item_GiveTo(entity item, entity player) // AnnounceTo(player, "ammo"); if (item.weapons & WEPBIT_MINSTANEX) - W_GiveWeapon (player, WEP_MINSTANEX, "Nex"); + W_GiveWeapon (player, WEP_MINSTANEX, item.netname); if (item.ammo_cells) player.ammo_cells = min (player.ammo_cells + cvar("g_minstagib_ammo_drop"), 999); player.health = 100; @@ -713,9 +713,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, return; } - itemid = self.items; - weaponid = self.weapons; - self.reset = Item_Reset; // it's a level item if(self.spawnflags & 1) @@ -912,7 +909,7 @@ void minstagib_items (float itemid) self.ammo_cells = 1; StartItem ("models/items/a_cells.md3", "misc/itempickup.wav", 45, 0, - "Nex Ammo", IT_CELLS, 0, 0, generic_pickupevalfunc, 100); + "MinstaNex Ammo", IT_CELLS, 0, 0, generic_pickupevalfunc, 100); return; } @@ -940,7 +937,6 @@ void minstagib_items (float itemid) StartItem ("models/items/g_h100.md3", "misc/megahealth.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, "Extralife", IT_NAILS, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_HIGH); - } // replace with speed if (itemid == IT_INVINCIBLE) @@ -950,7 +946,6 @@ void minstagib_items (float itemid) "misc/powerup_shield.wav", g_pickup_respawntime_powerup, g_pickup_respawntimejitter_powerup, "Speed", IT_INVINCIBLE, 0, FL_POWERUP, generic_pickupevalfunc, BOT_PICKUP_RATING_MID); } - } float minst_no_auto_cells; @@ -1376,9 +1371,6 @@ void spawnfunc_target_items (void) if(!self.invincible_finished) self.invincible_finished = cvar("g_balance_powerup_invincible_time"); - precache_sound("misc/itempickup.wav"); - precache_sound("misc/itempickup.wav"); - precache_sound("misc/itempickup.wav"); precache_sound("misc/itempickup.wav"); precache_sound("misc/megahealth.wav"); precache_sound("misc/armor25.wav"); -- 2.39.2