aboutsummaryrefslogtreecommitdiff
path: root/scumm/instrument.h
diff options
context:
space:
mode:
authorJamieson Christian2003-05-15 23:08:03 +0000
committerJamieson Christian2003-05-15 23:08:03 +0000
commit9f6b1bf3a1fbae4497a8c68cb2aec9d3c6f819cd (patch)
treef7f60e03aad9ddfc8a023ce9dcf58b052f19940d /scumm/instrument.h
parent4b82ea54cb8d19defa8c8b82a4829a0a5359e8ae (diff)
downloadscummvm-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.h')
-rw-r--r--scumm/instrument.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/scumm/instrument.h b/scumm/instrument.h
index f3607eab4d..c9dea601be 100644
--- a/scumm/instrument.h
+++ b/scumm/instrument.h
@@ -35,6 +35,7 @@ public:
virtual void send (MidiChannel *mc) = 0;
virtual void copy_to (Instrument *dest) = 0;
virtual bool is_valid() = 0;
+ virtual operator int() { return 255; }
};
class Instrument {
@@ -54,6 +55,7 @@ public:
void clear();
void copy_to (Instrument *dest) { if (_instrument) _instrument->copy_to (dest); else dest->clear(); }
+ operator int() { return (_instrument ? (int) _instrument : 255); }
void program (byte program, bool mt32);
void adlib (byte *instrument);
void roland (byte *instrument);