From 3793b366dc9770255480da6ac08306e805d2151c Mon Sep 17 00:00:00 2001 From: Mehis Date: Wed, 7 Mar 2018 23:02:55 +0200 Subject: [PATCH] Fix Linux soundscapes --- mp/src/game/server/soundscape_system.cpp | 4 ++-- sp/src/game/server/soundscape_system.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mp/src/game/server/soundscape_system.cpp b/mp/src/game/server/soundscape_system.cpp index 29b29402..4eb5b213 100644 --- a/mp/src/game/server/soundscape_system.cpp +++ b/mp/src/game/server/soundscape_system.cpp @@ -62,7 +62,7 @@ void CSoundscapeSystem::AddSoundscapeFile( const char *filename ) MEM_ALLOC_CREDIT(); // Open the soundscape data file, and abort if we can't KeyValues *pKeyValuesData = new KeyValues( filename ); - if ( filesystem->LoadKeyValues( *pKeyValuesData, IFileSystem::TYPE_SOUNDSCAPE, filename, "GAME" ) ) + if ( pKeyValuesData->LoadFromFile( filesystem, filename, "GAME" ) ) { // parse out all of the top level sections and save their names KeyValues *pKeys = pKeyValuesData; @@ -137,7 +137,7 @@ bool CSoundscapeSystem::Init() } KeyValues *manifest = new KeyValues( SOUNDSCAPE_MANIFEST_FILE ); - if ( filesystem->LoadKeyValues( *manifest, IFileSystem::TYPE_SOUNDSCAPE, SOUNDSCAPE_MANIFEST_FILE, "GAME" ) ) + if ( manifest->LoadFromFile( filesystem, SOUNDSCAPE_MANIFEST_FILE, "GAME" ) ) { for ( KeyValues *sub = manifest->GetFirstSubKey(); sub != NULL; sub = sub->GetNextKey() ) { diff --git a/sp/src/game/server/soundscape_system.cpp b/sp/src/game/server/soundscape_system.cpp index 29b29402..4eb5b213 100644 --- a/sp/src/game/server/soundscape_system.cpp +++ b/sp/src/game/server/soundscape_system.cpp @@ -62,7 +62,7 @@ void CSoundscapeSystem::AddSoundscapeFile( const char *filename ) MEM_ALLOC_CREDIT(); // Open the soundscape data file, and abort if we can't KeyValues *pKeyValuesData = new KeyValues( filename ); - if ( filesystem->LoadKeyValues( *pKeyValuesData, IFileSystem::TYPE_SOUNDSCAPE, filename, "GAME" ) ) + if ( pKeyValuesData->LoadFromFile( filesystem, filename, "GAME" ) ) { // parse out all of the top level sections and save their names KeyValues *pKeys = pKeyValuesData; @@ -137,7 +137,7 @@ bool CSoundscapeSystem::Init() } KeyValues *manifest = new KeyValues( SOUNDSCAPE_MANIFEST_FILE ); - if ( filesystem->LoadKeyValues( *manifest, IFileSystem::TYPE_SOUNDSCAPE, SOUNDSCAPE_MANIFEST_FILE, "GAME" ) ) + if ( manifest->LoadFromFile( filesystem, SOUNDSCAPE_MANIFEST_FILE, "GAME" ) ) { for ( KeyValues *sub = manifest->GetFirstSubKey(); sub != NULL; sub = sub->GetNextKey() ) {