From ea955675db26106dfc22aaf5a9721c056437ddfc Mon Sep 17 00:00:00 2001 From: D G Turner Date: Fri, 8 Sep 2017 02:56:22 +0100 Subject: SUPERNOVA: Fix GCC Warning for Malformed Narrowing Conversions in C++11. --- engines/supernova/supernova.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp index e421d6f1b4..73ce543618 100644 --- a/engines/supernova/supernova.cpp +++ b/engines/supernova/supernova.cpp @@ -400,7 +400,9 @@ void SupernovaEngine::renderRoom(Room &room) { } int SupernovaEngine::textWidth(const uint16 key) { - const char text[2] = {key & 0xFF, 0}; + char text[2]; + text[0] = key & 0xFF; + text[1] = 0; return textWidth(text); } @@ -545,7 +547,9 @@ void SupernovaEngine::renderText(const char *text, int x, int y, byte color) { } void SupernovaEngine::renderText(const uint16 character, int x, int y, byte color) { - char text[2] = {character & 0xFF, 0}; + char text[2]; + text[0] = character & 0xFF; + text[1] = 0; renderText(text, x, y, color); } @@ -554,7 +558,9 @@ void SupernovaEngine::renderText(const char *text) { } void SupernovaEngine::renderText(const uint16 character) { - char text[2] = {character & 0xFF, 0}; + char text[2]; + text[0] = character & 0xFF; + text[1] = 0; renderText(text, _textCursorX, _textCursorY, _textColor); } -- cgit v1.2.3