libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-05 16:21:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removing this casting operator. I changed the only place it was used to an 'error' a long time ago, and so far nobody reported anything about it.

Browse Source 
svn-id: r17601
This commit is contained in:
Max Horn 2005-04-14 19:23:21 +00:00
parent 1b76f9d058
commit 4b18be1cf7
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scumm/instrument.cpp
View File

@ -135,7 +135,6 @@ public:
void send (MidiChannel *mc); void send (MidiChannel *mc);
void copy_to (Instrument *dest) { dest->program (_program, _mt32); } void copy_to (Instrument *dest) { dest->program (_program, _mt32); }
bool is_valid() { return (_program < 128) && ((_native_mt32 == _mt32) || _native_mt32 ? (MidiDriver::_gmToMt32[_program] < 128) : (MidiDriver::_mt32ToGm[_program] < 128)); } bool is_valid() { return (_program < 128) && ((_native_mt32 == _mt32) || _native_mt32 ? (MidiDriver::_gmToMt32[_program] < 128) : (MidiDriver::_mt32ToGm[_program] < 128)); }
operator int() { return (_program < 128) ? _program : 255; }
}; };
class Instrument_Adlib : public InstrumentInternal { class Instrument_Adlib : public InstrumentInternal {

13
scumm/instrument.h
View File

@ -62,19 +62,6 @@ public:
void clear(); void clear();
void copy_to (Instrument *dest) { if (_instrument) _instrument->copy_to (dest); else dest->clear(); } void copy_to (Instrument *dest) { if (_instrument) _instrument->copy_to (dest); else dest->clear(); }
// FIXME: This is evil! We cast a pointer to an int. Besides not being
// portable to 64bit systems, it is unclear why this is needed.
// If the only reason is to supply a unique identifier of that
// instrument: there are better ways do do that.
// OTOH, maybe the code is simply wrong, and what is really meant
// here is to first dereference _instrument, then cast it? Like
// this: (int)*_instrument
// At least this would explain the otherwise unused operator int()
// supplied by class Instrument_Program.
// If that is the case, the operator int() should all be replaced by
// a proper method, like "get_something()"
operator int() { return (_instrument ? (int) _instrument : 255); }
void program (byte program, bool mt32); void program (byte program, bool mt32);
void adlib (byte *instrument); void adlib (byte *instrument);
void roland (byte *instrument); void roland (byte *instrument);