diff options
| author | Filippos Karapetis | 2009-10-22 08:55:54 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-10-22 08:55:54 +0000 |
| commit | 8f0e47e671046707bd03c71772a6bde5e3e9b7d9 (patch) | |
| tree | f22db2b4d2242092207cb9713befa6cfc06c4b27 /engines/sci/sfx/softseq | |
| parent | a1c23f4487b75d3646f8267d8925c1ae953a4a60 (diff) | |
| download | scummvm-rg350-8f0e47e671046707bd03c71772a6bde5e3e9b7d9.tar.gz scummvm-rg350-8f0e47e671046707bd03c71772a6bde5e3e9b7d9.tar.bz2 scummvm-rg350-8f0e47e671046707bd03c71772a6bde5e3e9b7d9.zip | |
Fixed signed/unsigned issues with the property() function of the Adlib driver
svn-id: r45332
Diffstat (limited to 'engines/sci/sfx/softseq')
| -rw-r--r-- | engines/sci/sfx/softseq/adlib.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/sfx/softseq/adlib.h | 2 |
2 files changed, 4 insertions, 4 deletions
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 { |