Merge 79960e4811 into 0565403b15

src/game/client/c_slideshow_display.cpp

@@ -267,7 +267,7 @@ void C_SlideshowDisplay::BuildSlideShowImagesList( void )
 		char szFullFileName[_MAX_PATH];
 		Q_snprintf( szFullFileName, sizeof( szFullFileName ), "materials/vgui/%s/%s", m_szSlideshowDirectory, szMatFileName );
 
-		KeyValues *pMaterialKeys = new KeyValues( "material" );
+		KeyValuesAD pMaterialKeys( "material" );
 		bool bLoaded = pMaterialKeys->LoadFromFile( g_pFullFileSystem, szFullFileName, NULL );
 
 		if ( bLoaded )

src/game/client/tf/tf_autorp.cpp

@@ -35,7 +35,7 @@ void CTFAutoRP::ParseDataFile( void )
 	Assert( !m_pDataFileKV );
 
 	// Load & parse the word files
-	KeyValues *pFileKV = new KeyValues( "AutoRPFile" );
+	KeyValuesAD pFileKV( "AutoRPFile" );
 	if ( pFileKV->LoadFromFile( filesystem, "scripts/autorp.txt", "MOD" ) == false )
 		return;
 

src/game/client/tf/tf_hud_mainmenuoverride.cpp

@@ -777,7 +777,7 @@ void CHudMainMenuOverride::LoadCharacterImageFile( void )
 //-----------------------------------------------------------------------------
 void CHudMainMenuOverride::LoadMenuEntries( void )
 {
-	KeyValues *datafile = new KeyValues("GameMenu");
+	KeyValuesAD datafile("GameMenu");
 	datafile->UsesEscapeSequences( true );	// VGUI uses escape sequences
 	bool bLoaded = datafile->LoadFromFile( g_pFullFileSystem, "Resource/GameMenu.res", "custom_mod" );
 	if ( !bLoaded )
@@ -2274,7 +2274,7 @@ public:
 
 		//V_strcpy_safe( uilanguage, "german" );
 
-		KeyValues *pEntriesKV = new KeyValues( "motd_entries");
+		KeyValuesAD pEntriesKV( "motd_entries");
 
 		// Try and load the cache file. If we fail, we'll just create a new one.
 		if ( !pMMPanel->ReloadedAllMOTDs() )

src/game/server/slideshow_display.cpp

@@ -523,7 +523,7 @@ void CSlideshowDisplay::BuildSlideShowImagesList( void )
 		char szFullFileName[_MAX_PATH];
 		Q_snprintf( szFullFileName, sizeof( szFullFileName ), "materials/vgui/%s/%s", m_szSlideshowDirectory.Get(), szMatFileName );
 
-		KeyValues *pMaterialKeys = new KeyValues( "material" );
+		KeyValuesAD pMaterialKeys( "material" );
 		bool bLoaded = pMaterialKeys->LoadFromFile( g_pFullFileSystem, szFullFileName, NULL );
 
 		if ( bLoaded )

src/game/shared/achievementmgr.cpp

@@ -801,7 +801,7 @@ void CAchievementMgr::LoadGlobalState()
     // HPE_END
     //=============================================================================
 
-	KeyValues *pKV = new KeyValues("GameState" );
+	KeyValuesAD pKV("GameState" );
 	if ( pKV->LoadFromFile( filesystem, szFilename, "MOD" ) )
 	{
 		KeyValues *pNode = pKV->GetFirstSubKey();

src/game/shared/activitylist.cpp

@@ -2607,7 +2607,7 @@ void UTIL_LoadActivityRemapFile( const char *filename, const char *section, CUtl
 		return;
 	}
 
-	KeyValues *pkvFile = new KeyValues( section );
+	KeyValuesAD pkvFile( section );
 
 	if ( pkvFile->LoadFromFile( filesystem, filename, NULL ) )
 	{

src/game/shared/econ/econ_item_system.cpp

@@ -177,10 +177,14 @@ void CEconItemSystem::ReloadWhitelist( void )
 
 	// If we didn't find a file, we're done.
 	if ( !bFoundWhitelist )
+	{
+		pWhitelistKV->deleteThis();
 		return;
+	}
 
 	// Otherwise, go through the KVs and turn on the matching items.
 	Msg("Parsing item whitelist (default: %s)\n", bDefault ? "allowed" : "disallowed" );
+	KeyValues* ownerWhitelistKV = pWhitelistKV;
 	pWhitelistKV = pWhitelistKV->GetFirstSubKey();
 	while ( pWhitelistKV )
 	{
@@ -204,6 +208,8 @@ void CEconItemSystem::ReloadWhitelist( void )
 		pWhitelistKV = pWhitelistKV->GetNextKey();
 	}
 	Msg("Finished.\n");
+
+	ownerWhitelistKV->deleteThis();
 }
 
 #ifdef GAME_DLL

src/game/shared/particle_parse.cpp

@@ -186,7 +186,7 @@ void ParseParticleEffectsMap( const char *pMapName, bool bLoadSheets )
 		V_snprintf( szMapManifestFilename, sizeof( szMapManifestFilename ), "maps/%s_particles.txt", pMapName );
 	}
 
-	KeyValues *manifest = new KeyValues( szMapManifestFilename );
+	KeyValuesAD manifest( szMapManifestFilename );
 
 	// In order:
 	//  - particles.txt within the map BSP