[Scummvm-cvs-logs] SF.net SVN: scummvm:[46849] scummvm/trunk/engines/sci
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Fri Jan 1 21:49:57 CET 2010
Revision: 46849
http://scummvm.svn.sourceforge.net/scummvm/?rev=46849&view=rev
Author: m_kiewitz
Date: 2010-01-01 20:49:56 +0000 (Fri, 01 Jan 2010)
Log Message:
-----------
SCI: volume for sci0 now set to 127, now using constant instead of value
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/sfx/music.h
scummvm/trunk/engines/sci/sfx/soundcmd.cpp
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2010-01-01 20:37:02 UTC (rev 46848)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2010-01-01 20:49:56 UTC (rev 46849)
@@ -120,7 +120,7 @@
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;
Modified: scummvm/trunk/engines/sci/sfx/music.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.h 2010-01-01 20:37:02 UTC (rev 46848)
+++ scummvm/trunk/engines/sci/sfx/music.h 2010-01-01 20:49:56 UTC (rev 46849)
@@ -56,6 +56,8 @@
kSoundPlaying = 3
};
+#define MUSIC_VOLUME_FOR_SCI0 127
+
class MidiParser_SCI;
class SegManager;
Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp 2010-01-01 20:37:02 UTC (rev 46848)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp 2010-01-01 20:49:56 UTC (rev 46849)
@@ -420,7 +420,7 @@
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 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list