aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-01 20:49:56 +0000
committerMartin Kiewitz2010-01-01 20:49:56 +0000
commit967853c03f03bc620ab82e1550a419d716ba3388 (patch)
tree18f0dfd415a42d45f584c5bad8f237129acf8451 /engines/sci
parent6385e77d85471ff0bc759122a8d0a4b064b13a28 (diff)
downloadscummvm-rg350-967853c03f03bc620ab82e1550a419d716ba3388.tar.gz
scummvm-rg350-967853c03f03bc620ab82e1550a419d716ba3388.tar.bz2
scummvm-rg350-967853c03f03bc620ab82e1550a419d716ba3388.zip
SCI: volume for sci0 now set to 127, now using constant instead of value
svn-id: r46849
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/engine/savegame.cpp2
-rw-r--r--engines/sci/sfx/music.h2
-rw-r--r--engines/sci/sfx/soundcmd.cpp4
3 files changed, 5 insertions, 3 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index a5a65e683f..315b264ddd 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -120,7 +120,7 @@ void MusicEntry::saveLoadWithSerializer(Common::Serializer &s) {
s.syncAsSint32LE(hold);
// volume and dataInc will be synced from the sound objects
// when the sound list is reconstructed in gamestate_restore()
- volume = 100;
+ volume = MUSIC_VOLUME_FOR_SCI0;
dataInc = 0;
// No fading info
fadeTo = 0;
diff --git a/engines/sci/sfx/music.h b/engines/sci/sfx/music.h
index a9ff38f688..fe025f18a7 100644
--- a/engines/sci/sfx/music.h
+++ b/engines/sci/sfx/music.h
@@ -56,6 +56,8 @@ enum SoundStatus {
kSoundPlaying = 3
};
+#define MUSIC_VOLUME_FOR_SCI0 127
+
class MidiParser_SCI;
class SegManager;
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp
index b673af95aa..cd781ce7c4 100644
--- a/engines/sci/sfx/soundcmd.cpp
+++ b/engines/sci/sfx/soundcmd.cpp
@@ -420,7 +420,7 @@ void SoundCommandParser::cmdPlayHandle(reg_t obj, int16 value) {
musicSlot->prio = GET_SEL32V(_segMan, obj, priority);
// vol selector doesnt get used before sci1late
if (_soundVersion < SCI_VERSION_1_LATE)
- musicSlot->volume = 100;
+ musicSlot->volume = MUSIC_VOLUME_FOR_SCI0;
else
musicSlot->volume = GET_SEL32V(_segMan, obj, vol);
_music->soundPlay(musicSlot);
@@ -991,7 +991,7 @@ void SoundCommandParser::reconstructPlayList(int savegame_version) {
if (_soundVersion >= SCI_VERSION_1_EARLY)
(*i)->volume = GET_SEL32V(_segMan, (*i)->soundObj, vol);
else
- (*i)->volume = 100;
+ (*i)->volume = MUSIC_VOLUME_FOR_SCI0;
}
(*i)->soundRes = new SoundResource((*i)->resnum, _resMan, _soundVersion);