From 158d12e555abe05e6e08a026c156097e48b2802f Mon Sep 17 00:00:00 2001
From: m-kiewitz
Date: Sat, 21 Sep 2013 14:34:42 +0200
Subject: SCI: abbrev. ffs to FE and priority check fix

---
 engines/sci/engine/savegame.cpp | 2 +-
 engines/sci/sound/soundcmd.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index fa9363abe3..c60b50a964 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 90ad51b5d8..e36c5705ab 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;
-- 
cgit v1.2.3