HOPKINS: Improve private/public scope in SoundManager and ScriptManager

1 files changed, 44 insertions, 47 deletions

diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h
index 081046d335..70c05a83fc 100644
--- a/engines/hopkins/sound.h
+++ b/engines/hopkins/sound.h
@@ -65,79 +65,76 @@ class SoundManager {
 private:
 	HopkinsEngine *_vm;
 
+	Audio::SoundHandle _musicHandle;
+	int _currentSoundIndex;
+	bool _modPlayingFl;
+	int _oldSoundNumber;
+
+	VoiceItem _voice[VOICE_COUNT];
+	SwavItem Swav[SWAV_COUNT];
+	SoundItem _sound[SOUND_COUNT];
+	MusicItem _music;
+
+	void playMod(const Common::String &file);
+	void loadMusic(const Common::String &file);
+	void playMusic();
+	void stopMusic();
+	void delMusic();
 	bool checkVoiceStatus(int voiceIndex);
 	void stopVoice(int voiceIndex);
-	void SDL_LVOICE(Common::String filename, size_t filePosition, size_t entryLength);
 	void playVoice();
+	void delWav(int wavIndex);
+	void checkVoiceActivity();
+	Common::String setExtension(const Common::String &str, const Common::String &ext);
+	Audio::RewindableAudioStream *makeSoundStream(Common::SeekableReadStream *stream);
+
+	void SDL_LVOICE(Common::String filename, size_t filePosition, size_t entryLength);
 	bool DEL_SAMPLE_SDL(int wavIndex);
 	bool SDL_LoadVoice(const Common::String &filename, size_t fileOffset, size_t entryLength, SwavItem &item);
 	void LOAD_SAMPLE2_SDL(int wavIndex, const Common::String &filename, bool freeSample);
-	void delWav(int wavIndex);
 	void PLAY_SAMPLE_SDL(int voiceIndex, int wavIndex);
 
-	/**
-	 * Checks voices to see if they're finished
-	 */
-	void checkVoiceActivity();
-
-	/**
-	 * Creates an audio stream based on a passed raw stream
-	 */
-	Audio::RewindableAudioStream *makeSoundStream(Common::SeekableReadStream *stream);
 public:
-	Audio::SoundHandle _musicHandle;
-	int _specialSoundNum;
-	int _soundVolume;
-	int _voiceVolume;
-	int _musicVolume;
-	bool _soundOffFl;
 	bool _musicOffFl;
+	bool _soundOffFl;
 	bool _voiceOffFl;
 	bool _textOffFl;
 	bool _soundFl;
-	bool skipRefreshFl;
-	int _currentSoundIndex;
-	bool _modPlayingFl;
-	int _oldSoundNumber;
-
-	VoiceItem _voice[VOICE_COUNT];
-	SwavItem Swav[SWAV_COUNT];
-	SoundItem _sound[SOUND_COUNT];
-	MusicItem _music;
+	bool _skipRefreshFl;
+	int _musicVolume;
+	int _soundVolume;
+	int _voiceVolume;
+	int _specialSoundNum;
 public:
 	SoundManager();
 	~SoundManager();
 	void setParent(HopkinsEngine *vm);
 
-	void checkSoundEnd();
 	void loadAnimSound();
 	void playAnimSound(int soundNumber);
-	void loadWav(const Common::String &file, int wavIndex);
-	void playWav(int wavIndex);
-	void WSOUND(int soundNumber);
-	void WSOUND_OFF();
-	void playMod(const Common::String &file);
-	void loadMusic(const Common::String &file);
-	void playMusic();
-	void stopMusic();
-	void delMusic();
 
+	void loadSample(int wavIndex, const Common::String &file);
+	void playSample(int wavIndex, int voiceMode);
 
-	bool mixVoice(int voiceId, int voiceMode);
-	void DEL_SAMPLE(int soundIndex);
+	void checkSoundEnd();
+	void checkSounds();
 	void playSound(const Common::String &file);
-	void PLAY_SOUND2(const Common::String &file2);
+	void updateScummVMSoundSettings();
+	void syncSoundSettings();
+	bool mixVoice(int voiceId, int voiceMode);
+
+	void MODSetMusicVolume(int volume);
 	void MODSetSampleVolume();
 	void MODSetVoiceVolume();
-	void MODSetMusicVolume(int volume);
-	void loadSample(int wavIndex, const Common::String &file);
-	void playSample(int wavIndex, int voiceMode);
-	void PLAY_SAMPLE2(int idx);
 
-	void syncSoundSettings();
-	void updateScummVMSoundSettings();
-	void checkSounds();
-	Common::String setExtension(const Common::String &str, const Common::String &ext);
+	void loadWav(const Common::String &file, int wavIndex);
+	void playWav(int wavIndex);
+
+	void DEL_SAMPLE(int soundIndex);
+	void WSOUND(int soundNumber);
+	void WSOUND_OFF();
+	void PLAY_SOUND2(const Common::String &file2);
+	void PLAY_SAMPLE2(int idx);
 };
 
 } // End of namespace Hopkins