[Scummvm-cvs-logs] scummvm master -> 158d12e555abe05e6e08a026c156097e48b2802f

m-kiewitz m_kiewitz at users.sourceforge.net
Sat Sep 21 14:35:00 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
158d12e555 SCI: abbrev. ffs to FE and priority check fix


Commit: 158d12e555abe05e6e08a026c156097e48b2802f
    https://github.com/scummvm/scummvm/commit/158d12e555abe05e6e08a026c156097e48b2802f
Author: m-kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2013-09-21T05:34:42-07:00

Commit Message:
SCI: abbrev. ffs to FE and priority check fix

Changed paths:
    engines/sci/engine/savegame.cpp
    engines/sci/sound/soundcmd.cpp



diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index fa9363a..c60b50a 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -600,7 +600,7 @@ void MusicEntry::saveLoadWithSerializer(Common::Serializer &s) {
 	s.syncAsSint16LE(dataInc);
 	s.syncAsSint16LE(ticker);
 	s.syncAsSint16LE(signal, VER(17));
-	if (s.getVersion() >= 31) // ffs. sound/music.h -> priority
+	if (s.getVersion() >= 31) // FE sound/music.h -> priority
 		s.syncAsSint16LE(priority);
 	else
 		s.syncAsByte(priority);
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 90ad51b..e36c570 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -431,7 +431,7 @@ reg_t SoundCommandParser::kDoSoundUpdate(int argc, reg_t *argv, reg_t acc) {
 	int16 objVol = CLIP<int>(readSelectorValue(_segMan, obj, SELECTOR(vol)), 0, 255);
 	if (objVol != musicSlot->volume)
 		_music->soundSetVolume(musicSlot, objVol);
-	int32 objPrio = readSelectorValue(_segMan, obj, SELECTOR(priority));
+	int16 objPrio = readSelectorValue(_segMan, obj, SELECTOR(priority));
 	if (objPrio != musicSlot->priority)
 		_music->soundSetPriority(musicSlot, objPrio);
 	return acc;






More information about the Scummvm-git-logs mailing list