aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2010-02-13 17:46:05 +0000
committerMax Horn2010-02-13 17:46:05 +0000
commit06021f79acfb32677e68b8697d5ba63059a6893d (patch)
treeb37518ae105fc461e197298495357e64297f183a
parente45f0f309acd2448dc042bd89584791f932388a3 (diff)
downloadscummvm-rg350-06021f79acfb32677e68b8697d5ba63059a6893d.tar.gz
scummvm-rg350-06021f79acfb32677e68b8697d5ba63059a6893d.tar.bz2
scummvm-rg350-06021f79acfb32677e68b8697d5ba63059a6893d.zip
SCI: Fix compiling with USE_OLD_MUSIC_FUNCTIONS enabled
svn-id: r48051
-rw-r--r--engines/sci/engine/savegame.cpp2
-rw-r--r--engines/sci/sound/soundcmd.cpp26
2 files changed, 14 insertions, 14 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 22405b8b99..792f1c4392 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -967,7 +967,7 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
#ifdef USE_OLD_MUSIC_FUNCTIONS
temp = retval->_sound._songlib;
- retval->_sound.sfx_init(retval->resMan, s->sfx_init_flags, g_sci->_features->detectDoSoundType());
+ retval->_sound.sfx_init(g_sci->getResMan(), s->sfx_init_flags, g_sci->_features->detectDoSoundType());
retval->sfx_init_flags = s->sfx_init_flags;
retval->_sound._songlib.freeSounds();
retval->_sound._songlib = temp;
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 70e0ba5b0c..214180fafd 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -266,7 +266,7 @@ void SoundCommandParser::cmdInitSound(reg_t obj, int16 value) {
SongIteratorType type = (_soundVersion <= SCI_VERSION_0_LATE) ? SCI_SONG_ITERATOR_TYPE_SCI0 : SCI_SONG_ITERATOR_TYPE_SCI1;
if (_soundVersion <= SCI_VERSION_0_LATE) {
- if (GET_SEL32V(_segMan, obj, SELECTOR(nodePtr));) {
+ if (GET_SEL32V(_segMan, obj, SELECTOR(nodePtr))) {
_state->sfx_song_set_status(handle, SOUND_STATUS_STOPPED);
_state->sfx_remove_song(handle);
}
@@ -345,12 +345,12 @@ void SoundCommandParser::cmdPlaySound(reg_t obj, int16 value) {
if (_soundVersion <= SCI_VERSION_0_LATE) {
_state->sfx_song_set_status(handle, SOUND_STATUS_PLAYING);
- _state->sfx_song_set_loops(handle, GET_SEL32V(_segMan, obj, SELECTOR(loop)););
+ _state->sfx_song_set_loops(handle, GET_SEL32V(_segMan, obj, SELECTOR(loop)));
PUT_SEL32V(_segMan, obj, SELECTOR(state), kSoundPlaying);
} else if (_soundVersion == SCI_VERSION_1_EARLY) {
_state->sfx_song_set_status(handle, SOUND_STATUS_PLAYING);
- _state->sfx_song_set_loops(handle, GET_SEL32V(_segMan, obj, SELECTOR(loop)););
- _state->sfx_song_renice(handle, GET_SEL32V(_segMan, obj, SELECTOR(pri)););
+ _state->sfx_song_set_loops(handle, GET_SEL32V(_segMan, obj, SELECTOR(loop)));
+ _state->sfx_song_renice(handle, GET_SEL32V(_segMan, obj, SELECTOR(pri)));
RESTORE_BEHAVIOR rb = (RESTORE_BEHAVIOR) value; /* Too lazy to look up a default value for this */
_state->_songlib.setSongRestoreBehavior(handle, rb);
PUT_SEL32V(_segMan, obj, SELECTOR(signal), 0);
@@ -362,13 +362,13 @@ void SoundCommandParser::cmdPlaySound(reg_t obj, int16 value) {
Song *song = _state->_songlib.findSong(handle);
int songNumber = GET_SEL32V(_segMan, obj, SELECTOR(number));
- if (GET_SEL32V(_segMan, obj, SELECTOR(nodePtr)); && (song && songNumber != song->_resourceNum)) {
+ if (GET_SEL32V(_segMan, obj, SELECTOR(nodePtr)) && (song && songNumber != song->_resourceNum)) {
_state->sfx_song_set_status(handle, SOUND_STATUS_STOPPED);
_state->sfx_remove_song(handle);
PUT_SEL32(_segMan, obj, SELECTOR(nodePtr), NULL_REG);
}
- if (!GET_SEL32V(_segMan, obj, SELECTOR(nodePtr)); && obj.segment) {
+ if (!GET_SEL32V(_segMan, obj, SELECTOR(nodePtr)) && obj.segment) {
// In SCI1.1 games, sound effects are started from here. If we can find
// a relevant audio resource, play it, otherwise switch to synthesized
// effects. If the resource exists, play it using map 65535 (sound
@@ -596,7 +596,7 @@ void SoundCommandParser::cmdMasterVolume(reg_t obj, int16 value) {
_acc = make_reg(0, _state->sfx_getVolume());
if (obj != SIGNAL_REG)
- _state->sfx_setVolume(obj.toSint16());
+ _state->sfx_setVolume(obj.toSint16());
#else
debugC(2, kDebugLevelSound, "cmdMasterVolume: %d", value);
_acc = make_reg(0, _music->soundGetMasterVolume());
@@ -696,9 +696,9 @@ void SoundCommandParser::cmdUpdateSound(reg_t obj, int16 value) {
#ifdef USE_OLD_MUSIC_FUNCTIONS
SongHandle handle = FROBNICATE_HANDLE(obj);
if (_soundVersion <= SCI_VERSION_0_LATE && obj.segment) {
- _state->sfx_song_set_loops(handle, GET_SEL32V(_segMan, obj, SELECTOR(loop)););
- script_set_priority(_resMan, _segMan, _state, obj, GET_SEL32V(_segMan, obj, SELECTOR(pri)););
- }
+ _state->sfx_song_set_loops(handle, GET_SEL32V(_segMan, obj, SELECTOR(loop)));
+ script_set_priority(_resMan, _segMan, _state, obj, GET_SEL32V(_segMan, obj, SELECTOR(pri)));
+ }
#else
MusicEntry *musicSlot = _music->getSlot(obj);
if (!musicSlot) {
@@ -766,7 +766,7 @@ void SoundCommandParser::cmdUpdateCues(reg_t obj, int16 value) {
//switch (signal) {
//case 0x00:
- // if (dataInc!=GET_SEL32V(segMan, obj, SELECTOR(dataInc));) {
+ // if (dataInc != GET_SEL32V(segMan, obj, SELECTOR(dataInc))) {
// PUT_SEL32V(segMan, obj, SELECTOR(dataInc), dataInc);
// PUT_SEL32V(segMan, obj, SELECTOR(signal), dataInc+0x7f);
// } else {
@@ -777,7 +777,7 @@ void SoundCommandParser::cmdUpdateCues(reg_t obj, int16 value) {
// s->_sound.sfx_song_set_status(handle, SOUND_STATUS_STOPPED);
// break;
//default :
- // if (dataInc!=GET_SEL32V(segMan, obj, SELECTOR(dataInc));) {
+ // if (dataInc != GET_SEL32V(segMan, obj, SELECTOR(dataInc))) {
// PUT_SEL32V(segMan, obj, SELECTOR(dataInc), dataInc);
// PUT_SEL32V(segMan, obj, SELECTOR(signal), dataInc + 0x7f);
// } else {
@@ -983,7 +983,7 @@ void SoundCommandParser::cmdSetSoundLoop(reg_t obj, int16 value) {
return;
#ifdef USE_OLD_MUSIC_FUNCTIONS
- if (!GET_SEL32(_segMan, obj, SELECTOR(nodePtr));.isNull()) {
+ if (!GET_SEL32(_segMan, obj, SELECTOR(nodePtr)).isNull()) {
SongHandle handle = FROBNICATE_HANDLE(obj);
_state->sfx_song_set_loops(handle, value);
}