[Scummvm-git-logs] scummvm master -> 331f2e17426b0b2b7b178597ba5a9f88264fe19f

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
331f2e1742 GROOVIE: Fix GCC Compiler Set But Unused Variable Warning


Commit: 331f2e17426b0b2b7b178597ba5a9f88264fe19f
    https://github.com/scummvm/scummvm/commit/331f2e17426b0b2b7b178597ba5a9f88264fe19f
Author: D G Turner (digitall at scummvm.org)
Date: 2022-01-03T15:32:02Z

Commit Message:
GROOVIE: Fix GCC Compiler Set But Unused Variable Warning

Changed paths:
    engines/groovie/video/roq.cpp


diff --git a/engines/groovie/video/roq.cpp b/engines/groovie/video/roq.cpp
index fcf783c1664..82237d424fd 100644
--- a/engines/groovie/video/roq.cpp
+++ b/engines/groovie/video/roq.cpp
@@ -896,15 +896,20 @@ void ROQPlayer::createAudioStream(bool stereo) {
 }
 
 void ROQPlayer::drawString(const Common::String text, int posx, int posy, uint32 color) {
+	// TODO: fix redraw
+#if 0
 	int screenOffset = 0;
 	if (_screen->h != 480) {
 		screenOffset = 80;
 	}
 
 	Graphics::Surface *gamescreen = _vm->_system->lockScreen();
-	// TODO fix redraw
-	//Common::Rect rect(posx, posy - screenOffset, posx + _vm->_font->getMaxCharWidth()*15, posy + _vm->_font->getFontHeight()*2 - screenOffset);
-	//gamescreen->copyRectToSurface(*_bg, posx, posy, rect);
+	Common::Rect rect(posx, posy - screenOffset, posx + _vm->_font->getMaxCharWidth()*15, posy + _vm->_font->getFontHeight()*2 - screenOffset);
+	gamescreen->copyRectToSurface(*_bg, posx, posy, rect);
+#else
+	Graphics::Surface *gamescreen = _vm->_system->lockScreen();
+#endif
+
 	_vm->_font->drawString(gamescreen, text.c_str(), posx, posy, _overBuf->w, color, Graphics::kTextAlignLeft);
 	_vm->_system->unlockScreen();
 	_vm->_graphicsMan->change(); // Force Update screen after step