From 64b5805a11ebb8abcdd09eab76416bc11b3a6912 Mon Sep 17 00:00:00 2001 From: Rain Date: Tue, 17 Sep 2024 20:06:26 +0300 Subject: [PATCH] Revert "replace weapon_switch with ClientCommand (#570)" This reverts commit d209d44bee85d46180ebdf741e0ed81a85851c62. --- mp/src/game/server/neo/neo_player.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mp/src/game/server/neo/neo_player.cpp b/mp/src/game/server/neo/neo_player.cpp index c5dabe409..49387e85e 100644 --- a/mp/src/game/server/neo/neo_player.cpp +++ b/mp/src/game/server/neo/neo_player.cpp @@ -2491,22 +2491,21 @@ void CNEO_Player::GiveDefaultItems(void) GiveNamedItem("weapon_knife"); GiveNamedItem("weapon_milso"); if (this->m_iXP >= 4) { GiveDet(this); } - engine->ClientCommand(edict(), "slot2"); + Weapon_Switch(Weapon_OwnsThisType("weapon_milso")); break; case NEO_CLASS_ASSAULT: GiveNamedItem("weapon_knife"); GiveNamedItem("weapon_tachi"); GiveNamedItem("weapon_grenade"); - engine->ClientCommand(edict(), "slot2"); + Weapon_Switch(Weapon_OwnsThisType("weapon_tachi")); break; case NEO_CLASS_SUPPORT: GiveNamedItem("weapon_kyla"); GiveNamedItem("weapon_smokegrenade"); - engine->ClientCommand(edict(), "slot2"); + Weapon_Switch(Weapon_OwnsThisType("weapon_kyla")); break; default: GiveNamedItem("weapon_knife"); - engine->ClientCommand(edict(), "slot3"); break; } } @@ -2559,7 +2558,7 @@ void CNEO_Player::GiveLoadoutWeapon(void) RemoveAllItems(false); GiveDefaultItems(); pEnt->Touch(this); - engine->ClientCommand(edict(), "slot1"); + Weapon_Switch(Weapon_OwnsThisType(szWep)); } } else @@ -2590,7 +2589,7 @@ void CNEO_Player::GiveAllItems(void) GiveNamedItem("weapon_tachi"); GiveNamedItem("weapon_zr68s"); - engine->ClientCommand(edict(), "slot1"); + Weapon_Switch(Weapon_OwnsThisType("weapon_zr68s")); } // Purpose: For Neotokyo, we could use this engine method