From 0ae65a5a64eefeaf2e8db2a838964a1b1015a47f Mon Sep 17 00:00:00 2001 From: Peter Covington Date: Tue, 19 Apr 2022 02:53:35 -0400 Subject: [PATCH] Fix weapon selection --- sp/src/game/client/prediction.cpp | 2 +- sp/src/game/server/player_command.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sp/src/game/client/prediction.cpp b/sp/src/game/client/prediction.cpp index d7dfbff7..6d3a0439 100644 --- a/sp/src/game/client/prediction.cpp +++ b/sp/src/game/client/prediction.cpp @@ -855,7 +855,7 @@ void CPrediction::RunCommand( C_BasePlayer *player, CUserCmd *ucmd, IMoveHelper C_BaseCombatWeapon *weapon = dynamic_cast< C_BaseCombatWeapon * >( CBaseEntity::Instance( ucmd->weaponselect ) ); if ( weapon ) { - player->SelectItem( weapon->GetName(), ucmd->weaponsubtype ); + player->SelectItem( weapon->GetClassname(), ucmd->weaponsubtype ); } } diff --git a/sp/src/game/server/player_command.cpp b/sp/src/game/server/player_command.cpp index d5a6a1f0..7614babe 100644 --- a/sp/src/game/server/player_command.cpp +++ b/sp/src/game/server/player_command.cpp @@ -393,7 +393,7 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper if ( weapon ) { VPROF( "player->SelectItem()" ); - player->SelectItem( weapon->GetName(), ucmd->weaponsubtype ); + player->SelectItem( weapon->GetClassname(), ucmd->weaponsubtype ); } }