diff options
| author | Jamieson Christian | 2003-05-15 23:08:03 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-05-15 23:08:03 +0000 |
| commit | 9f6b1bf3a1fbae4497a8c68cb2aec9d3c6f819cd (patch) | |
| tree | f7f60e03aad9ddfc8a023ce9dcf58b052f19940d /scumm/instrument.cpp | |
| parent | 4b82ea54cb8d19defa8c8b82a4829a0a5359e8ae (diff) | |
| download | scummvm-rg350-9f6b1bf3a1fbae4497a8c68cb2aec9d3c6f819cd.tar.gz scummvm-rg350-9f6b1bf3a1fbae4497a8c68cb2aec9d3c6f819cd.tar.bz2 scummvm-rg350-9f6b1bf3a1fbae4497a8c68cb2aec9d3c6f819cd.zip | |
Removed deprecated _program.
Miscellaneous cleanup.
svn-id: r7552
Diffstat (limited to 'scumm/instrument.cpp')
| -rw-r--r-- | scumm/instrument.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/instrument.cpp b/scumm/instrument.cpp index f0bfdb082d..e1f129006c 100644 --- a/scumm/instrument.cpp +++ b/scumm/instrument.cpp @@ -25,7 +25,7 @@ #include "scumm/instrument.h" #include "sound/mididrv.h" -#define NATIVE_MT32 false +#define NATIVE_MT32 true static const byte mt32_to_gm[128] = { // 0 1 2 3 4 5 6 7 8 9 A B C D E F @@ -136,6 +136,7 @@ public: void send (MidiChannel *mc); void copy_to (Instrument *dest) { dest->program (_program, _mt32); } bool is_valid() { return (_program < 128); } + operator int() { return (_program < 128) ? _program : 255; } }; class Instrument_Adlib : public InstrumentInternal { |