mirror of
https://github.com/ValveSoftware/source-sdk-2013.git
synced 2025-04-09 03:24:52 +00:00
Merge 65c9f625c5
into 0565403b15
This commit is contained in:
commit
5f34e8623e
4 changed files with 6 additions and 3 deletions
|
@ -602,7 +602,7 @@ public:
|
|||
// Find the commentary file
|
||||
char szFullName[512];
|
||||
Q_snprintf(szFullName,sizeof(szFullName), "maps/%s_commentary.txt", STRING( gpGlobals->mapname ));
|
||||
KeyValues *pkvFile = new KeyValues( "Commentary" );
|
||||
KeyValuesAD pkvFile( "Commentary" );
|
||||
if ( pkvFile->LoadFromFile( filesystem, szFullName, "MOD" ) )
|
||||
{
|
||||
Msg( "Commentary: Loading commentary data from %s. \n", szFullName );
|
||||
|
|
|
@ -95,6 +95,7 @@ CNavMesh::~CNavMesh()
|
|||
delete [] m_placeName[i];
|
||||
}
|
||||
|
||||
delete [] m_placeName;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -227,6 +227,8 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
pkvMapCameras->deleteThis();
|
||||
|
||||
if ( !g_iDevShotCameraCount )
|
||||
{
|
||||
Warning( "Devshots: No point_devshot_camera in %s. Moving to next map.\n", STRING( gpGlobals->mapname ) );
|
||||
|
|
|
@ -13905,13 +13905,13 @@ bool CTFGameRules::IsFirstBloodAllowed( void )
|
|||
//-----------------------------------------------------------------------------
|
||||
void CTFGameRules::ShowRoundInfoPanel( CTFPlayer *pPlayer /* = NULL */ )
|
||||
{
|
||||
KeyValues *data = new KeyValues( "data" );
|
||||
|
||||
if ( m_iCurrentRoundState < 0 )
|
||||
{
|
||||
// Haven't set up the round state yet
|
||||
return;
|
||||
}
|
||||
|
||||
KeyValues *data = new KeyValues( "data" );
|
||||
|
||||
// if prev and cur are equal, we are starting from a fresh round
|
||||
if ( m_iPrevRoundState >= 0 && pPlayer == NULL ) // we have data about a previous state
|
||||
|
|
Loading…
Reference in a new issue