From 3e72a3e27edccb106d7fb381047109126e13f569 Mon Sep 17 00:00:00 2001 From: SanyaSho Date: Sat, 13 Aug 2022 20:35:04 +0300 Subject: [PATCH] game: fix 0xFFFFFF and add hidestatsdlg command --- game/client/tf2base/vgui/tf_statsummary.cpp | 12 ++++++++++-- game/shared/tf2base/tf_shareddefs.h | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/game/client/tf2base/vgui/tf_statsummary.cpp b/game/client/tf2base/vgui/tf_statsummary.cpp index a45eec95..2c39d54a 100644 --- a/game/client/tf2base/vgui/tf_statsummary.cpp +++ b/game/client/tf2base/vgui/tf_statsummary.cpp @@ -120,6 +120,7 @@ void CTFStatsSummaryPanel::PerformLayout() BaseClass::PerformLayout(); #ifndef _X360 + /* if ( m_pTipLabel && m_pTipText ) { m_pTipLabel->SizeToContents(); @@ -127,9 +128,10 @@ void CTFStatsSummaryPanel::PerformLayout() int x, y, w, t; m_pTipText->GetBounds( x, y, w, t ); - m_pTipText->SetBounds( x + width, y, w - width, t ); + m_pTipText->SetPos( ( ScreenWidth() * 0.0125 ) + ( x + w ), y ); m_pTipText->InvalidateLayout( false, true ); // have it re-layout the contents so it's wrapped correctly now that we've changed the size } + */ if ( m_pNextTipButton ) { @@ -378,7 +380,7 @@ void CTFStatsSummaryPanel::UpdateBarCharts() #define MAKEFLAG(x) ( 1 << x ) -#define ALL_CLASSES 0x1024 //0xFFFFFFFF FIXME: wtf? +#define ALL_CLASSES 0x7FFFFFFF //----------------------------------------------------------------------------- // Purpose: Updates class details @@ -887,3 +889,9 @@ CON_COMMAND( showstatsdlg, "Shows the player stats dialog" ) { GStatsSummaryPanel()->ShowModal(); } + +CON_COMMAND( hidestatsdlg, "Hides the player stats dialog" ) +{ + GStatsSummaryPanel()->SetVisible( false ); + GStatsSummaryPanel()->SetParent( (VPANEL) NULL ); +} diff --git a/game/shared/tf2base/tf_shareddefs.h b/game/shared/tf2base/tf_shareddefs.h index 85677de7..e2f8fb3b 100644 --- a/game/shared/tf2base/tf_shareddefs.h +++ b/game/shared/tf2base/tf_shareddefs.h @@ -593,7 +593,7 @@ extern const char *g_pszHintMessages[]; #define DMG_USEDISTANCEMOD (DMG_SLOWBURN) // NEED TO REMOVE CALTROPS #define DMG_NOCLOSEDISTANCEMOD (DMG_POISON) -#define TF_DMG_SENTINEL_VALUE 0x00512 //0xFFFFFFFF FIXME: wtf? +#define TF_DMG_SENTINEL_VALUE 0x7FFFFFFF // This can only ever be used on a TakeHealth call, since it re-uses a dmg flag that means something else #define DMG_IGNORE_MAXHEALTH (DMG_BULLET)