Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions mp/src/game/server/neo/neo_player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2564,21 +2564,22 @@ void CNEO_Player::GiveDefaultItems(void)
GiveNamedItem("weapon_knife");
GiveNamedItem("weapon_milso");
if (this->m_iXP >= 4) { GiveDet(this); }
Weapon_Switch(Weapon_OwnsThisType("weapon_milso"));
engine->ClientCommand(edict(), "slot2");
break;
case NEO_CLASS_ASSAULT:
GiveNamedItem("weapon_knife");
GiveNamedItem("weapon_tachi");
GiveNamedItem("weapon_grenade");
Weapon_Switch(Weapon_OwnsThisType("weapon_tachi"));
engine->ClientCommand(edict(), "slot2");
break;
case NEO_CLASS_SUPPORT:
GiveNamedItem("weapon_kyla");
GiveNamedItem("weapon_smokegrenade");
Weapon_Switch(Weapon_OwnsThisType("weapon_kyla"));
engine->ClientCommand(edict(), "slot2");
break;
default:
GiveNamedItem("weapon_knife");
engine->ClientCommand(edict(), "slot3");
break;
}
}
Expand Down Expand Up @@ -2631,7 +2632,7 @@ void CNEO_Player::GiveLoadoutWeapon(void)
RemoveAllItems(false);
GiveDefaultItems();
pEnt->Touch(this);
Weapon_Switch(Weapon_OwnsThisType(szWep));
engine->ClientCommand(edict(), "slot1");
}
}
else
Expand Down Expand Up @@ -2662,7 +2663,7 @@ void CNEO_Player::GiveAllItems(void)

GiveNamedItem("weapon_tachi");
GiveNamedItem("weapon_zr68s");
Weapon_Switch(Weapon_OwnsThisType("weapon_zr68s"));
engine->ClientCommand(edict(), "slot1");
}

// Purpose: For Neotokyo, we could use this engine method
Expand Down