mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-20 15:11:20 +02:00
Code Issues Projects Releases Wiki Activity

core_data/maint:coding style, playSound

Browse Source
This commit is contained in:
andy5995
2018-09-22 14:19:49 -05:00
parent 3143d0c7b6
commit ccb507a3f4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/global/core_data.cpp
View File

@@ -1782,7 +1782,7 @@ namespace Glest {
PlaySoundClip::~PlaySoundClip(void) { PlaySoundClip::~PlaySoundClip(void) {
}; };
StaticSound *PlaySoundClip::getSound(const std::string& PlaySoundVal) { StaticSound *PlaySoundClip::getSound(const std::string& playSoundVal) {
CoreData coreData; CoreData coreData;
int loadAttemptLookupKey = coreData.tsyst_COUNT + 6; int loadAttemptLookupKey = coreData.tsyst_COUNT + 6;
if (coreData.itemLoadAttempted.find(loadAttemptLookupKey) == if (coreData.itemLoadAttempted.find(loadAttemptLookupKey) ==
@@ -1792,7 +1792,7 @@ namespace Glest {
try { try {
string data_path = coreData.getDataPath(); string data_path = coreData.getDataPath();
PlaySound.load(getGameCustomCoreDataPath(data_path, PlaySoundVal)); playSound.load(getGameCustomCoreDataPath(data_path, playSoundVal));
} catch (const megaglest_runtime_error & ex) { } catch (const megaglest_runtime_error & ex) {
message(ex.what(), message(ex.what(),
GlobalStaticFlags::getIsNonGraphicalModeEnabled(), GlobalStaticFlags::getIsNonGraphicalModeEnabled(),
@@ -1800,7 +1800,7 @@ namespace Glest {
} }
} }
return &PlaySound; return &playSound;
} }
// ================== PRIVATE ======================== // ================== PRIVATE ========================

4
source/glest_game/global/core_data.h
View File

@@ -336,9 +336,9 @@ namespace Glest {
class PlaySoundClip { class PlaySoundClip {
private: private:
StaticSound PlaySound; StaticSound playSound;
public: public:
StaticSound * getSound(const std::string& PlaySoundVal); StaticSound * getSound(const std::string& playSoundVal);
static const string sfxAttention; static const string sfxAttention;
static const string sfxHighlight; static const string sfxHighlight;
static const string sfxNewServer; static const string sfxNewServer;