diff --git a/src/game/client/neo/ui/neo_hud_round_state.cpp b/src/game/client/neo/ui/neo_hud_round_state.cpp index b907e315b3..5d95aef213 100644 --- a/src/game/client/neo/ui/neo_hud_round_state.cpp +++ b/src/game/client/neo/ui/neo_hud_round_state.cpp @@ -45,6 +45,7 @@ extern ConVar sv_neo_readyup_countdown; extern ConVar cl_neo_hud_scoreboard_hide_others; extern ConVar sv_neo_ctg_ghost_overtime_grace; extern ConVar cl_neo_hud_health_mode; +extern ConVar sv_neo_bot_cmdr_enable; namespace { constexpr int Y_POS = 0; @@ -735,9 +736,7 @@ void CNEOHud_RoundState::DrawPlayerList() return; } - ConVarRef cl_neo_bot_cmdr_enable_ref("sv_neo_bot_cmdr_enable"); - Assert(cl_neo_bot_cmdr_enable_ref.IsValid()); - if (cl_neo_bot_cmdr_enable_ref.IsValid() && cl_neo_bot_cmdr_enable_ref.GetBool()) + if (sv_neo_bot_cmdr_enable.GetBool()) { DrawPlayerList_BotCmdr(); return; @@ -921,9 +920,7 @@ void CNEOHud_RoundState::DrawPlayerList_BotCmdr() int CNEOHud_RoundState::DrawPlayerRow(int playerIndex, const int yOffset, bool small) { - ConVarRef cl_neo_bot_cmdr_enable_ref("sv_neo_bot_cmdr_enable"); - Assert(cl_neo_bot_cmdr_enable_ref.IsValid()); - if (cl_neo_bot_cmdr_enable_ref.IsValid() && cl_neo_bot_cmdr_enable_ref.GetBool()) + if (sv_neo_bot_cmdr_enable.GetBool()) { return DrawPlayerRow_BotCmdr(playerIndex, yOffset, small); } @@ -1142,9 +1139,7 @@ void CNEOHud_RoundState::DrawPlayer(int playerIndex, int teamIndex, const TeamLo } // Draw commander selected highlight - ConVarRef cl_neo_bot_cmdr_enable_ref("sv_neo_bot_cmdr_enable"); - Assert(cl_neo_bot_cmdr_enable_ref.IsValid()); - if (cl_neo_bot_cmdr_enable_ref.IsValid() && cl_neo_bot_cmdr_enable_ref.GetBool()) + if (sv_neo_bot_cmdr_enable.GetBool()) { C_NEO_Player* pPlayer = static_cast(UTIL_PlayerByIndex(playerIndex)); if (pPlayer) diff --git a/src/game/shared/hl2mp/hl2mp_playeranimstate.cpp b/src/game/shared/hl2mp/hl2mp_playeranimstate.cpp index 9e441acd87..5ecee1cb5e 100644 --- a/src/game/shared/hl2mp/hl2mp_playeranimstate.cpp +++ b/src/game/shared/hl2mp/hl2mp_playeranimstate.cpp @@ -653,6 +653,9 @@ void CHL2MPPlayerAnimState::EstimateYaw( void ) // Input : dt - //----------------------------------------------------------------------------- float SnapYawTo( float flValue ); +#ifdef NEO +extern ConVar mp_slammoveyaw; +#endif void CHL2MPPlayerAnimState::ComputePoseParam_MoveYaw( CStudioHdr *pStudioHdr ) { #ifdef NEO @@ -662,7 +665,9 @@ void CHL2MPPlayerAnimState::ComputePoseParam_MoveYaw( CStudioHdr *pStudioHdr ) EstimateYaw(); #if 1 // 9way +#ifndef NEO ConVarRef mp_slammoveyaw("mp_slammoveyaw"); +#endif // Get the view yaw. float flAngle = AngleNormalize( m_flEyeYaw );