diff options
| author | Eugene Sandulenko | 2011-07-03 23:33:22 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2011-07-03 23:33:22 +0300 |
| commit | f70f27314f2bfd2192bb6d320e39518489139ea3 (patch) | |
| tree | ebf0310582da219ca9d9bf75203a76f826074c8b | |
| parent | 98dfef0ca4df8b2c8d16683a03d55a88783d7004 (diff) | |
| parent | 3f04ad72a998dead1b6b43a8facd4d7a62d2119a (diff) | |
| download | scummvm-rg350-f70f27314f2bfd2192bb6d320e39518489139ea3.tar.gz scummvm-rg350-f70f27314f2bfd2192bb6d320e39518489139ea3.tar.bz2 scummvm-rg350-f70f27314f2bfd2192bb6d320e39518489139ea3.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | engines/scumm/imuse/instrument.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/scumm/imuse/instrument.h b/engines/scumm/imuse/instrument.h index 3555d319e6..79cbd49032 100644 --- a/engines/scumm/imuse/instrument.h +++ b/engines/scumm/imuse/instrument.h @@ -39,7 +39,6 @@ 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 { |