From 3b153bc9c31c6564175373edfd344fa2731fb2b7 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Sun, 21 Aug 2022 02:12:18 +0300 Subject: [PATCH] fix day of defeat build --- game/client/dod/dod_hud_freezepanel.cpp | 4 ++-- game/client/hl2/hud_credits.cpp | 6 +++--- scripts/waifulib/compiler_optimizations.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/game/client/dod/dod_hud_freezepanel.cpp b/game/client/dod/dod_hud_freezepanel.cpp index 0d289707..41b661ca 100644 --- a/game/client/dod/dod_hud_freezepanel.cpp +++ b/game/client/dod/dod_hud_freezepanel.cpp @@ -196,7 +196,7 @@ void CDODFreezePanel::FireGameEvent( IGameEvent * event ) C_DOD_PlayerResource *tf_PR = dynamic_cast(g_PR); if ( !tf_PR ) { - m_pNemesisSubPanel->SetDialogVariable( "nemesisname", NULL ); + m_pNemesisSubPanel->SetDialogVariable( "nemesisname", 0 ); return; } @@ -664,4 +664,4 @@ void CDODFreezePanelCallout::ApplySchemeSettings( vgui::IScheme *pScheme ) BaseClass::ApplySchemeSettings( pScheme ); LoadControlSettings( "resource/UI/FreezePanelCallout.res" ); -} \ No newline at end of file +} diff --git a/game/client/hl2/hud_credits.cpp b/game/client/hl2/hud_credits.cpp index 8021c49a..c4693f62 100644 --- a/game/client/hl2/hud_credits.cpp +++ b/game/client/hl2/hud_credits.cpp @@ -432,7 +432,7 @@ void CHudCredits::DrawLogo( void ) } vgui::HScheme scheme = vgui::scheme()->GetScheme( "ClientScheme" ); - vgui::HFont m_hTFont = vgui::scheme()->GetIScheme(scheme)->GetFont( szLogoFont ); + vgui::HFont m_hTFont = vgui::scheme()->GetIScheme(scheme)->GetFont( szLogoFont, true ); int iFontTall = surface()->GetFontTall ( m_hTFont ); @@ -513,7 +513,7 @@ void CHudCredits::DrawIntroCreditsName( void ) continue; vgui::HScheme scheme = vgui::scheme()->GetScheme( "ClientScheme" ); - vgui::HFont m_hTFont = vgui::scheme()->GetIScheme(scheme)->GetFont( pCredit->szFontName ); + vgui::HFont m_hTFont = vgui::scheme()->GetIScheme(scheme)->GetFont( pCredit->szFontName, true ); float localTime = gpGlobals->curtime - pCredit->flTimeStart; @@ -675,7 +675,7 @@ void CHudCredits::PrepareIntroCredits( void ) continue; vgui::HScheme scheme = vgui::scheme()->GetScheme( "ClientScheme" ); - vgui::HFont m_hTFont = vgui::scheme()->GetIScheme(scheme)->GetFont( pCredit->szFontName ); + vgui::HFont m_hTFont = vgui::scheme()->GetIScheme(scheme)->GetFont( pCredit->szFontName, true ); pCredit->flYPos = m_flY + ( iSlot * surface()->GetFontTall ( m_hTFont ) ); pCredit->flXPos = m_flX; diff --git a/scripts/waifulib/compiler_optimizations.py b/scripts/waifulib/compiler_optimizations.py index 8064dd98..f8af85ac 100644 --- a/scripts/waifulib/compiler_optimizations.py +++ b/scripts/waifulib/compiler_optimizations.py @@ -48,8 +48,8 @@ CFLAGS = { 'common': { # disable thread-safe local static initialization for C++11 code, as it cause crashes on Windows XP 'msvc': ['/D_USING_V110_SDK71_', '/Zi', '/FS', '/Zc:threadSafeInit-'], - 'clang': ['-g0', '-fno-strict-aliasing', '-gdwarf-2', '-fvisibility=hidden'], - 'gcc': ['-g0', '-fno-strict-aliasing', '-fvisibility=hidden'], + 'clang': ['-g0', '-fno-strict-aliasing'], + 'gcc': ['-g0', '-fno-strict-aliasing'], 'owcc': ['-fno-short-enum', '-ffloat-store', '-g0'] }, 'fast': {