diff options
| -rw-r--r-- | engines/sci/sfx/sci_midi.h | 2 | ||||
| -rw-r--r-- | engines/sci/sfx/softseq/adlib.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/sfx/softseq/adlib.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/sfx/sci_midi.h b/engines/sci/sfx/sci_midi.h index 623dbd9f33..6fbece8dfd 100644 --- a/engines/sci/sfx/sci_midi.h +++ b/engines/sci/sfx/sci_midi.h @@ -86,7 +86,7 @@ public: } virtual int getVolume() { - return _driver ? _driver->property(MIDI_PROP_MASTER_VOLUME, -1) : 0; + return _driver ? _driver->property(MIDI_PROP_MASTER_VOLUME, 0xffff) : 0; } virtual void playSwitch(bool play) { diff --git a/engines/sci/sfx/softseq/adlib.cpp b/engines/sci/sfx/softseq/adlib.cpp index 1623520ea5..e21ddf11f9 100644 --- a/engines/sci/sfx/softseq/adlib.cpp +++ b/engines/sci/sfx/softseq/adlib.cpp @@ -629,16 +629,16 @@ bool MidiDriver_Adlib::loadResource(const byte *data, uint size) { return true; } -int32 MidiDriver_Adlib::property(int prop, int32 param) { +uint32 MidiDriver_Adlib::property(int prop, uint32 param) { switch(prop) { case MIDI_PROP_MASTER_VOLUME: - if(param != -1) + if (param != 0xffff) _masterVolume = param; return _masterVolume; default: break; } - return -1; + return 0; } diff --git a/engines/sci/sfx/softseq/adlib.h b/engines/sci/sfx/softseq/adlib.h index fccf0a2c94..63dd9021a1 100644 --- a/engines/sci/sfx/softseq/adlib.h +++ b/engines/sci/sfx/softseq/adlib.h @@ -55,7 +55,7 @@ public: void setVolume(byte volume); void playSwitch(bool play); bool loadResource(const byte *data, uint size); - virtual int32 property(int prop, int32 param); + uint32 property(int prop, uint32 param); private: enum ChannelID { |