MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-01-27 06:07:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merged dev changes 9/30/2019 - Last-minute change

Browse Source 
- Reverted Nbc66's CC changes for now
This commit is contained in:
Blixibon 2019-09-30 16:35:54 +00:00
parent 8ebe43d5d4
commit 756caa92e4
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sp/src/game/client/hud_closecaption.cpp
View File

@ -2562,10 +2562,8 @@ void CHudCloseCaption::Flush()
void CHudCloseCaption::InitCaptionDictionary( const char *dbfile ) void CHudCloseCaption::InitCaptionDictionary( const char *dbfile )
{ {
#ifndef MAPBASE // Nbc66
if ( m_CurrentLanguage.IsValid() && !Q_stricmp( m_CurrentLanguage.String(), dbfile ) ) if ( m_CurrentLanguage.IsValid() && !Q_stricmp( m_CurrentLanguage.String(), dbfile ) )
return; return;
#endif
m_CurrentLanguage = dbfile; m_CurrentLanguage = dbfile;
@ -2604,7 +2602,6 @@ void CHudCloseCaption::InitCaptionDictionary( const char *dbfile )
AsyncCaption_t& entry = m_AsyncCaptions[ m_AsyncCaptions.AddToTail() ]; AsyncCaption_t& entry = m_AsyncCaptions[ m_AsyncCaptions.AddToTail() ];
#ifndef MAPBASE // Nbc66
// Read the header // Read the header
filesystem->Read( &entry.m_Header, sizeof( entry.m_Header ), fh ); filesystem->Read( &entry.m_Header, sizeof( entry.m_Header ), fh );
if ( entry.m_Header.magic != COMPILED_CAPTION_FILEID ) if ( entry.m_Header.magic != COMPILED_CAPTION_FILEID )
@ -2615,7 +2612,6 @@ void CHudCloseCaption::InitCaptionDictionary( const char *dbfile )
Error( "Invalid directory size %d for %s\n", entry.m_Header.directorysize, fullpath ); Error( "Invalid directory size %d for %s\n", entry.m_Header.directorysize, fullpath );
//if ( entry.m_Header.blocksize != MAX_BLOCK_SIZE ) //if ( entry.m_Header.blocksize != MAX_BLOCK_SIZE )
// Error( "Invalid block size %d, expecting %d for %s\n", entry.m_Header.blocksize, MAX_BLOCK_SIZE, fullpath ); // Error( "Invalid block size %d, expecting %d for %s\n", entry.m_Header.blocksize, MAX_BLOCK_SIZE, fullpath );
#endif
int directoryBytes = entry.m_Header.directorysize * sizeof( CaptionLookup_t ); int directoryBytes = entry.m_Header.directorysize * sizeof( CaptionLookup_t );
entry.m_CaptionDirectory.EnsureCapacity( entry.m_Header.directorysize ); entry.m_CaptionDirectory.EnsureCapacity( entry.m_Header.directorysize );
@ -2780,14 +2776,7 @@ void OnCaptionLanguageChanged( IConVar *pConVar, const char *pOldString, float f
{ {
if ( g_pFullFileSystem->FileExists( fn ) ) if ( g_pFullFileSystem->FileExists( fn ) )
{ {
#ifdef MAPBASE // Nbc66
char dbfile[512];
Q_snprintf( dbfile, sizeof( dbfile ), "resource/closecaption_%s.txt", var.GetString() );
g_pVGuiLocalize->AddFile( fn, "GAME", true ); g_pVGuiLocalize->AddFile( fn, "GAME", true );
hudCloseCaption->InitCaptionDictionary( dbfile );
#else
g_pVGuiLocalize->AddFile( fn, "GAME", true );
#endif
} }
else else
{ {
@ -2815,12 +2804,6 @@ void OnCaptionLanguageChanged( IConVar *pConVar, const char *pOldString, float f
hudCloseCaption->InitCaptionDictionary( dbfile ); hudCloseCaption->InitCaptionDictionary( dbfile );
} }
} }
#ifdef MAPBASE // Nbc66
if (!engine->IsInGame())
{
engine->ClientCmd_Unrestricted( "hud_reloadscheme" );
}
#endif
DevMsg( "cc_lang = %s\n", var.GetString() ); DevMsg( "cc_lang = %s\n", var.GetString() );
} }