Renamed variables to match our naming conventions; added Sound::isVoiceActive() method; made some more members of class Sound private

svn-id: r17958

1 files changed, 10 insertions, 9 deletions

diff --git a/simon/sound.h b/simon/sound.h
index 69b5040f2d..ad0b535f5f 100644
--- a/simon/sound.h
+++ b/simon/sound.h
@@ -42,17 +42,17 @@ private:
 
 	uint16 *_filenums;
 	uint32 *_offsets;
-	uint16 _last_voice_file;
+	uint16 _lastVoiceFile;
 
-public:
-	SoundHandle _voice_handle;
-	SoundHandle _effects_handle;
-	SoundHandle _ambient_handle;
+	SoundHandle _voiceHandle;
+	SoundHandle _effectsHandle;
+	SoundHandle _ambientHandle;
 
-	bool _effects_file;
-	bool _voice_file;
-	uint _ambient_playing;
+	bool _hasEffectsFile;
+	bool _hasVoiceFile;
+	uint _ambientPlaying;
 
+public:
 	Sound(const byte game, const GameSpecificSettings *gss, SoundMixer *mixer);
 	~Sound();
 	
@@ -64,7 +64,8 @@ public:
 	void playEffects(uint sound);
 	void playAmbient(uint sound);
 
-	bool hasVoice();
+	bool hasVoice() const;
+	bool isVoiceActive() const;
 	void stopVoice();
 	void stopAll();
 	void effectsPause(bool b);