[Scummvm-git-logs] scummvm master -> 5b9531f00eeec46e8989217b7560b4c524f75de0

[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:
5b9531f00e SWORD2: fixed compiler warning with gcc 8.2


Commit: 5b9531f00eeec46e8989217b7560b4c524f75de0
    https://github.com/scummvm/scummvm/commit/5b9531f00eeec46e8989217b7560b4c524f75de0
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2018-09-13T20:57:13+01:00

Commit Message:
SWORD2: fixed compiler warning with gcc 8.2

engines/sword2/screen.cpp: In member function ‘void Sword2::Screen::rollCredits()’:
engines/sword2/screen.cpp:1121:102: warning: cast from type ‘const char*’ to type ‘byte*’ {aka ‘unsigned char*’} casts away qualifiers [-Wcast-qual]
      creditsLines[i]->sprite = _vm->_fontRenderer->makeTextSprite((byte *)creditsLines[i]->str.c_str(), 600, 14, _vm->_speechFontId, 0);

Changed paths:
    engines/sword2/screen.cpp


diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp
index f3363df..fd8dca5 100644
--- a/engines/sword2/screen.cpp
+++ b/engines/sword2/screen.cpp
@@ -1118,7 +1118,7 @@ void Screen::rollCredits() {
 			} else if (creditsLines[i]->top < scrollPos + 400) {
 				if (!creditsLines[i]->sprite) {
 					debug(2, "Creating line %d: '%s'", i, creditsLines[i]->str.c_str());
-					creditsLines[i]->sprite = _vm->_fontRenderer->makeTextSprite((byte *)creditsLines[i]->str.c_str(), 600, 14, _vm->_speechFontId, 0);
+					creditsLines[i]->sprite = _vm->_fontRenderer->makeTextSprite((const byte *)creditsLines[i]->str.c_str(), 600, 14, _vm->_speechFontId, 0);
 				}
 
 				FrameHeader frame;