From ccb507a3f4518bdeefb07d5e8a0494a774821b8a Mon Sep 17 00:00:00 2001 From: andy5995 Date: Sat, 22 Sep 2018 14:19:49 -0500 Subject: [PATCH] core_data/maint:coding style, playSound --- source/glest_game/global/core_data.cpp | 6 +++--- source/glest_game/global/core_data.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/glest_game/global/core_data.cpp b/source/glest_game/global/core_data.cpp index d25e891f5..1961fbac6 100644 --- a/source/glest_game/global/core_data.cpp +++ b/source/glest_game/global/core_data.cpp @@ -1782,7 +1782,7 @@ namespace Glest { PlaySoundClip::~PlaySoundClip(void) { }; - StaticSound *PlaySoundClip::getSound(const std::string& PlaySoundVal) { + StaticSound *PlaySoundClip::getSound(const std::string& playSoundVal) { CoreData coreData; int loadAttemptLookupKey = coreData.tsyst_COUNT + 6; if (coreData.itemLoadAttempted.find(loadAttemptLookupKey) == @@ -1792,7 +1792,7 @@ namespace Glest { try { string data_path = coreData.getDataPath(); - PlaySound.load(getGameCustomCoreDataPath(data_path, PlaySoundVal)); + playSound.load(getGameCustomCoreDataPath(data_path, playSoundVal)); } catch (const megaglest_runtime_error & ex) { message(ex.what(), GlobalStaticFlags::getIsNonGraphicalModeEnabled(), @@ -1800,7 +1800,7 @@ namespace Glest { } } - return &PlaySound; + return &playSound; } // ================== PRIVATE ======================== diff --git a/source/glest_game/global/core_data.h b/source/glest_game/global/core_data.h index dced3026d..73a6b5671 100644 --- a/source/glest_game/global/core_data.h +++ b/source/glest_game/global/core_data.h @@ -336,9 +336,9 @@ namespace Glest { class PlaySoundClip { private: - StaticSound PlaySound; + StaticSound playSound; public: - StaticSound * getSound(const std::string& PlaySoundVal); + StaticSound * getSound(const std::string& playSoundVal); static const string sfxAttention; static const string sfxHighlight; static const string sfxNewServer;