diff options
| author | m-kiewitz | 2013-09-21 14:34:42 +0200 |
|---|---|---|
| committer | m-kiewitz | 2013-09-21 14:34:42 +0200 |
| commit | 158d12e555abe05e6e08a026c156097e48b2802f (patch) | |
| tree | 4fd0b85cf201c532cbf79f147818f584b20793f7 /engines | |
| parent | 4443793b97761ab1dc1fb312a4092211356b008e (diff) | |
| download | scummvm-rg350-158d12e555abe05e6e08a026c156097e48b2802f.tar.gz scummvm-rg350-158d12e555abe05e6e08a026c156097e48b2802f.tar.bz2 scummvm-rg350-158d12e555abe05e6e08a026c156097e48b2802f.zip | |
SCI: abbrev. ffs to FE and priority check fix
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 2 | ||||
| -rw-r--r-- | 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; |