Skip to content
Merged
Show file tree
Hide file tree
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
13 changes: 4 additions & 9 deletions src/game/client/neo/ui/neo_hud_round_state.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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<C_NEO_Player*>(UTIL_PlayerByIndex(playerIndex));
if (pPlayer)
Expand Down
5 changes: 5 additions & 0 deletions src/game/shared/hl2mp/hl2mp_playeranimstate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 );
Expand Down
Loading