From 9604a144647f078c2135bfda435d11963282c29d Mon Sep 17 00:00:00 2001 From: AdamTadeusz Date: Sun, 5 May 2024 18:30:09 +0100 Subject: [PATCH 1/4] Disabled ammo secondary elements --- mp/src/game/client/hl2/hud_ammo.cpp | 3 ++- mp/src/game/client/hl2/hud_battery.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mp/src/game/client/hl2/hud_ammo.cpp b/mp/src/game/client/hl2/hud_ammo.cpp index c04efa34e..9f294481c 100644 --- a/mp/src/game/client/hl2/hud_ammo.cpp +++ b/mp/src/game/client/hl2/hud_ammo.cpp @@ -508,5 +508,6 @@ class CHudSecondaryAmmo : public CHudNumericDisplay, public CHudElement int m_iAmmo; }; +#ifndef NEO DECLARE_HUDELEMENT( CHudSecondaryAmmo ); - +#endif \ No newline at end of file diff --git a/mp/src/game/client/hl2/hud_battery.cpp b/mp/src/game/client/hl2/hud_battery.cpp index c07943c10..c094f707d 100644 --- a/mp/src/game/client/hl2/hud_battery.cpp +++ b/mp/src/game/client/hl2/hud_battery.cpp @@ -46,7 +46,9 @@ class CHudBattery : public CHudNumericDisplay, public CHudElement int m_iNewBat; }; +#ifndef NEO DECLARE_HUDELEMENT( CHudBattery ); +#endif DECLARE_HUD_MESSAGE( CHudBattery, Battery ); //----------------------------------------------------------------------------- From 43400277533f1fb3fdac25e7050c151d9eb25c76 Mon Sep 17 00:00:00 2001 From: AdamTadeusz Date: Mon, 6 May 2024 14:09:09 +0100 Subject: [PATCH 2/4] Disabling some more hug elements we don't need anymore --- mp/src/game/client/hl2/hud_credits.cpp | 5 +++++ mp/src/game/client/hl2/hud_quickinfo.cpp | 2 ++ mp/src/game/client/hl2/hud_suitpower.cpp | 2 ++ mp/src/game/client/hl2/hud_zoom.cpp | 2 ++ 4 files changed, 11 insertions(+) diff --git a/mp/src/game/client/hl2/hud_credits.cpp b/mp/src/game/client/hl2/hud_credits.cpp index 6ad1488ba..117cd289b 100644 --- a/mp/src/game/client/hl2/hud_credits.cpp +++ b/mp/src/game/client/hl2/hud_credits.cpp @@ -164,9 +164,11 @@ void CHudCredits::PrepareCredits( const char *pKeyName ) using namespace vgui; +#ifndef NEO // CNHudCredits DECLARE_HUDELEMENT( CHudCredits ); DECLARE_HUD_MESSAGE( CHudCredits, CreditsMsg ); DECLARE_HUD_MESSAGE( CHudCredits, LogoTimeMsg ); +#endif //----------------------------------------------------------------------------- // Purpose: Constructor @@ -196,8 +198,11 @@ void CHudCredits::Clear( void ) //----------------------------------------------------------------------------- void CHudCredits::Init() { + +#ifndef NEO // CNEOHud_Ammo HOOK_HUD_MESSAGE( CHudCredits, CreditsMsg ); HOOK_HUD_MESSAGE( CHudCredits, LogoTimeMsg ); +#endif SetActive( false ); } diff --git a/mp/src/game/client/hl2/hud_quickinfo.cpp b/mp/src/game/client/hl2/hud_quickinfo.cpp index 37db4c310..15fb15b52 100644 --- a/mp/src/game/client/hl2/hud_quickinfo.cpp +++ b/mp/src/game/client/hl2/hud_quickinfo.cpp @@ -89,7 +89,9 @@ class CHUDQuickInfo : public CHudElement, public vgui::Panel CHudTexture *m_icon_lbe; // left bracket, empty }; +#ifndef NEO // CNHudQuickInfo DECLARE_HUDELEMENT( CHUDQuickInfo ); +#endif CHUDQuickInfo::CHUDQuickInfo( const char *pElementName ) : CHudElement( pElementName ), BaseClass( NULL, "HUDQuickInfo" ) diff --git a/mp/src/game/client/hl2/hud_suitpower.cpp b/mp/src/game/client/hl2/hud_suitpower.cpp index 416c9300c..ec849b0fb 100644 --- a/mp/src/game/client/hl2/hud_suitpower.cpp +++ b/mp/src/game/client/hl2/hud_suitpower.cpp @@ -20,7 +20,9 @@ using namespace vgui; // memdbgon must be the last include file in a .cpp file!!! #include "tier0/memdbgon.h" +#ifndef NEO // CHudSuitPower DECLARE_HUDELEMENT( CHudSuitPower ); +#endif #define SUITPOWER_INIT -1 diff --git a/mp/src/game/client/hl2/hud_zoom.cpp b/mp/src/game/client/hl2/hud_zoom.cpp index 8b47e8797..d5851431a 100644 --- a/mp/src/game/client/hl2/hud_zoom.cpp +++ b/mp/src/game/client/hl2/hud_zoom.cpp @@ -56,7 +56,9 @@ class CHudZoom : public vgui::Panel, public CHudElement CMaterialReference m_ZoomMaterial; }; +#ifndef NEO // CHudZoom DECLARE_HUDELEMENT( CHudZoom ); +#endif using namespace vgui; From 670b93597a256d219ae33c7f210990d5f18e14ab Mon Sep 17 00:00:00 2001 From: AdamTadeusz Date: Wed, 8 May 2024 22:09:49 +0100 Subject: [PATCH 3/4] disabled battery update message --- mp/src/game/client/hl2/hud_battery.cpp | 4 +++- mp/src/game/server/player.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mp/src/game/client/hl2/hud_battery.cpp b/mp/src/game/client/hl2/hud_battery.cpp index c094f707d..ac153aaae 100644 --- a/mp/src/game/client/hl2/hud_battery.cpp +++ b/mp/src/game/client/hl2/hud_battery.cpp @@ -48,8 +48,8 @@ class CHudBattery : public CHudNumericDisplay, public CHudElement #ifndef NEO DECLARE_HUDELEMENT( CHudBattery ); -#endif DECLARE_HUD_MESSAGE( CHudBattery, Battery ); +#endif //----------------------------------------------------------------------------- // Purpose: Constructor @@ -64,7 +64,9 @@ CHudBattery::CHudBattery( const char *pElementName ) : BaseClass(NULL, "HudSuit" //----------------------------------------------------------------------------- void CHudBattery::Init( void ) { +#ifndef NEO HOOK_HUD_MESSAGE( CHudBattery, Battery); +#endif Reset(); m_iBat = INIT_BAT; m_iNewBat = 0; diff --git a/mp/src/game/server/player.cpp b/mp/src/game/server/player.cpp index 56d67822a..161ba4df6 100644 --- a/mp/src/game/server/player.cpp +++ b/mp/src/game/server/player.cpp @@ -6852,6 +6852,7 @@ void CBasePlayer::UpdateClientData( void ) { m_iClientBattery = m_ArmorValue; +#ifndef NEO // send "battery" update message if ( usermessages->LookupUserMessage( "Battery" ) != -1 ) { @@ -6859,6 +6860,7 @@ void CBasePlayer::UpdateClientData( void ) WRITE_SHORT( (int)m_ArmorValue); MessageEnd(); } +#endif } #if 0 // BYE BYE!! From 11c6c56d8a30e16895bb01a2f6150831ab5147ae Mon Sep 17 00:00:00 2001 From: AdamTadeusz Date: Thu, 9 May 2024 12:51:46 +0100 Subject: [PATCH 4/4] hide team hud (not being used currently) --- mp/src/game/client/hl2mp/hl2mp_hud_team.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mp/src/game/client/hl2mp/hl2mp_hud_team.cpp b/mp/src/game/client/hl2mp/hl2mp_hud_team.cpp index c3f0c058c..1c1c70ab3 100644 --- a/mp/src/game/client/hl2mp/hl2mp_hud_team.cpp +++ b/mp/src/game/client/hl2mp/hl2mp_hud_team.cpp @@ -50,7 +50,9 @@ class CTeamPlayHud : public vgui::Panel, public CHudElement CPanelAnimationVarAliasType( int, m_iTextY, "text_ypos", "8", "proportional_int" ); }; +#ifndef NEO DECLARE_HUDELEMENT( CTeamPlayHud ); +#endif //----------------------------------------------------------------------------- // Purpose: Constructor