diff options
| author | Florian Kagerer | 2008-06-26 20:43:23 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2008-06-26 20:43:23 +0000 |
| commit | 0bea51974e4173cd7432348c334a6bb49f4aca6f (patch) | |
| tree | 3e5d99adf5999b5695e60b1b5d8922a8c3ee3a04 /engines/kyra | |
| parent | b695cb74ca3c4e3fe671e670f70d18d503df953c (diff) | |
| download | scummvm-rg350-0bea51974e4173cd7432348c334a6bb49f4aca6f.tar.gz scummvm-rg350-0bea51974e4173cd7432348c334a6bb49f4aca6f.tar.bz2 scummvm-rg350-0bea51974e4173cd7432348c334a6bb49f4aca6f.zip | |
fix bad const casts
svn-id: r32812
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/sound_towns.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 550908fd0f..40a746f1de 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -159,7 +159,7 @@ public: void loadDataToEndOfQueue(uint8 *trackdata, uint32 size, bool loop = 0); void setPlayBackStatus(bool playing); bool isPlaying() {return _playing; } - const uint8 * trackData() {return _trackData; } + uint8 *trackData() {return _trackData; } bool _loop; Towns_EuphonyTrackQueue *_next; @@ -807,7 +807,7 @@ void Towns_EuphonyParser::parseNextEvent(EventInfo &info) { if (info.ext.type == 0x2F) { unloadMusic(); memset(&info, 0, sizeof(EventInfo)); - pos = _position._play_pos = _tracks[0] = (byte*) _queue->trackData() + 0x806; + pos = _position._play_pos = _tracks[0] = _queue->trackData() + 0x806; } else if (_active_track == 255) { _queue = _queue->_next; setup(); @@ -964,7 +964,7 @@ void Towns_EuphonyParser::resetTracking() { } void Towns_EuphonyParser::setup() { - uint8 *data = (uint8 *) _queue->trackData(); + uint8 *data = _queue->trackData(); if (!data) return; _queue->initDriver(); |