diff --git a/source/glest_game/global/core_data.cpp b/source/glest_game/global/core_data.cpp index 62e70fbcf..fbd23b506 100644 --- a/source/glest_game/global/core_data.cpp +++ b/source/glest_game/global/core_data.cpp @@ -773,31 +773,6 @@ namespace Glest return &attentionSound; } - StaticSound *CoreData::getNewServerSound () - { - int loadAttemptLookupKey = tsyst_COUNT + 6; - if (itemLoadAttempted.find (loadAttemptLookupKey) == - itemLoadAttempted.end ()) - { - - itemLoadAttempted[loadAttemptLookupKey] = true; - - try - { - static Config & config = Config::getInstance (); - newServerSound.load (config.getString ("PlaySoundNewServer", "")); - } - catch (const megaglest_runtime_error & ex) - { - message (ex.what (), - GlobalStaticFlags::getIsNonGraphicalModeEnabled (), - tempDataLocation); - } - } - - return &newServerSound; - } - StaticSound *CoreData::getHighlightSound () { int loadAttemptLookupKey = tsyst_COUNT + 7; diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp index fc4583c5f..9a5e546ec 100644 --- a/source/glest_game/menu/menu_state_masterserver.cpp +++ b/source/glest_game/menu/menu_state_masterserver.cpp @@ -1217,7 +1217,7 @@ namespace Glest if (playServerFoundSound) { SoundRenderer::getInstance ().playFx (CoreData::getInstance (). - getNewServerSound ()); + getSound ("PlaySoundNewServer")); //switch on music again!! Config & config = Config::getInstance (); float configVolume = (config.getInt ("SoundVolumeMusic") / 100.f);