From b6242d0ea5603f73b488ed144ee3807b89829072 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Thu, 18 Apr 2013 17:45:50 +0200
Subject: WINTERMUTE: Use int32 instead of int in classes.

---
 engines/wintermute/base/sound/base_sound.h         | 2 +-
 engines/wintermute/base/sound/base_sound_buffer.h  | 4 ++--
 engines/wintermute/base/sound/base_sound_manager.h | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/wintermute/base/sound')

diff --git a/engines/wintermute/base/sound/base_sound.h b/engines/wintermute/base/sound/base_sound.h
index 637061b7cc..3412e6c3a3 100644
--- a/engines/wintermute/base/sound/base_sound.h
+++ b/engines/wintermute/base/sound/base_sound.h
@@ -67,7 +67,7 @@ private:
 	Common::String _soundFilename;
 	bool _soundStreamed;
 	Audio::Mixer::SoundType _soundType;
-	int _soundPrivateVolume;
+	int32 _soundPrivateVolume;
 	uint32 _soundLoopStart;
 	uint32 _soundPosition;
 	bool _soundPlaying;
diff --git a/engines/wintermute/base/sound/base_sound_buffer.h b/engines/wintermute/base/sound/base_sound_buffer.h
index 9c39f4c34b..e78d062cd4 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.h
+++ b/engines/wintermute/base/sound/base_sound_buffer.h
@@ -86,13 +86,13 @@ public:
 	Audio::Mixer::SoundType _type;
 	bool _looping;
 
-	int _privateVolume;
+	int32 _privateVolume;
 private:
 	uint32 _startPos;
 	Common::String _filename;
 	bool _streamed;
 	Common::SeekableReadStream *_file;
-	int _volume;
+	int32 _volume;
 };
 
 } // end of namespace Wintermute
diff --git a/engines/wintermute/base/sound/base_sound_manager.h b/engines/wintermute/base/sound/base_sound_manager.h
index 33f0ffd8e1..602571765f 100644
--- a/engines/wintermute/base/sound/base_sound_manager.h
+++ b/engines/wintermute/base/sound/base_sound_manager.h
@@ -49,7 +49,7 @@ public:
 	byte getVolumePercent(Audio::Mixer::SoundType type);
 	bool setVolumePercent(Audio::Mixer::SoundType type, byte percent);
 	bool setVolume(Audio::Mixer::SoundType type, int volume);
-	int _volumeMaster;
+	int32 _volumeMaster;
 	bool removeSound(BaseSoundBuffer *sound);
 	BaseSoundBuffer *addSound(const Common::String &filename, Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType, bool streamed = false);
 	bool addSound(BaseSoundBuffer *sound, Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType);
@@ -60,7 +60,7 @@ public:
 	Common::Array<BaseSoundBuffer *> _sounds;
 	void saveSettings();
 private:
-	int _volumeMasterPercent; // Necessary to avoid round-offs.
+	int32 _volumeMasterPercent; // Necessary to avoid round-offs.
 	bool setMasterVolume(byte percent);
 };
 
-- 
cgit v1.2.3