diff options
| author | Johannes Schickel | 2012-06-16 02:33:12 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-06-16 02:38:59 +0200 |
| commit | 2afc0a5fbc963562b5826965f4498156d1767a62 (patch) | |
| tree | ab59313bf2e2d66e19a5dfd1d2a1674974bbf28d | |
| parent | d4a5615a8bc50c6f5f9221a71135d9b4f5726522 (diff) | |
| download | scummvm-rg350-2afc0a5fbc963562b5826965f4498156d1767a62.tar.gz scummvm-rg350-2afc0a5fbc963562b5826965f4498156d1767a62.tar.bz2 scummvm-rg350-2afc0a5fbc963562b5826965f4498156d1767a62.zip | |
GROOVIE: Get rid of casts on OSystem::copyRectToScreen calls.
| -rw-r--r-- | engines/groovie/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/groovie/roq.cpp | 2 | ||||
| -rw-r--r-- | engines/groovie/script.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/groovie/graphics.cpp b/engines/groovie/graphics.cpp index c3ca03750a..73eb574dec 100644 --- a/engines/groovie/graphics.cpp +++ b/engines/groovie/graphics.cpp @@ -94,7 +94,7 @@ void GraphicsMan::mergeFgAndBg() { } void GraphicsMan::updateScreen(Graphics::Surface *source) { - _vm->_system->copyRectToScreen((byte *)source->getBasePtr(0, 0), 640, 0, 80, 640, 320); + _vm->_system->copyRectToScreen(source->getBasePtr(0, 0), 640, 0, 80, 640, 320); change(); } diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index baf42a7679..35d7ecf886 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -160,7 +160,7 @@ bool ROQPlayer::playFrameInternal() { if (_dirty) { // Update the screen - _syst->copyRectToScreen((byte *)_bg->getBasePtr(0, 0), _bg->pitch, 0, (_syst->getHeight() - _bg->h) / 2, _bg->w, _bg->h); + _syst->copyRectToScreen(_bg->getBasePtr(0, 0), _bg->pitch, 0, (_syst->getHeight() - _bg->h) / 2, _bg->w, _bg->h); _syst->updateScreen(); // Clear the dirty flag diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp index 68415233f4..cbbdecc3e7 100644 --- a/engines/groovie/script.cpp +++ b/engines/groovie/script.cpp @@ -373,7 +373,7 @@ bool Script::hotspot(Common::Rect rect, uint16 address, uint8 cursor) { DebugMan.isDebugChannelEnabled(kGroovieDebugAll)) { rect.translate(0, -80); _vm->_graphicsMan->_foreground.frameRect(rect, 250); - _vm->_system->copyRectToScreen((byte *)_vm->_graphicsMan->_foreground.getBasePtr(0, 0), _vm->_graphicsMan->_foreground.pitch, 0, 80, 640, 320); + _vm->_system->copyRectToScreen(_vm->_graphicsMan->_foreground.getBasePtr(0, 0), _vm->_graphicsMan->_foreground.pitch, 0, 80, 640, 320); _vm->_system->updateScreen(); } @@ -1231,7 +1231,7 @@ void Script::o_copyrecttobg() { // 0x37 memcpy(bg + offset, fg + offset, width); offset += 640; } - _vm->_system->copyRectToScreen((byte *)_vm->_graphicsMan->_background.getBasePtr(left, top - 80), 640, left, top, width, height); + _vm->_system->copyRectToScreen(_vm->_graphicsMan->_background.getBasePtr(left, top - 80), 640, left, top, width, height); _vm->_graphicsMan->change(); } |