[Scummvm-git-logs] scummvm master -> 480713a46c04e88b7bb4c02b75a4e3693cf3466c

waltervn walter at vanniftrik-it.nl
Mon Dec 26 12:39:31 CET 2016


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:
480713a46c ADL: Silence CID 1354788/1354789/1354790


Commit: 480713a46c04e88b7bb4c02b75a4e3693cf3466c
    https://github.com/scummvm/scummvm/commit/480713a46c04e88b7bb4c02b75a4e3693cf3466c
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2016-12-26T12:36:25+01:00

Commit Message:
ADL: Silence CID 1354788/1354789/1354790

Changed paths:
    engines/adl/display.cpp


diff --git a/engines/adl/display.cpp b/engines/adl/display.cpp
index 2cf50f7..feef8fb 100644
--- a/engines/adl/display.cpp
+++ b/engines/adl/display.cpp
@@ -130,7 +130,7 @@ Display::Display() :
 	_frameBufSurface->create(DISPLAY_WIDTH * 2, DISPLAY_HEIGHT * 2, Graphics::PixelFormat::createFormatCLUT8());
 
 	_textBuf = new byte[TEXT_BUF_SIZE];
-	memset(_textBuf, APPLECHAR(' '), TEXT_BUF_SIZE);
+	memset(_textBuf, (byte)APPLECHAR(' '), TEXT_BUF_SIZE);
 	_textBufSurface = new Graphics::Surface;
 	// For ease of copying, also use 2x scaling here
 	_textBufSurface->create(DISPLAY_WIDTH * 2, DISPLAY_HEIGHT * 2, Graphics::PixelFormat::createFormatCLUT8());
@@ -267,7 +267,7 @@ void Display::clear(byte color) {
 }
 
 void Display::home() {
-	memset(_textBuf, APPLECHAR(' '), TEXT_BUF_SIZE);
+	memset(_textBuf, (byte)APPLECHAR(' '), TEXT_BUF_SIZE);
 	_cursorPos = 0;
 }
 
@@ -546,7 +546,7 @@ void Display::createFont() {
 
 void Display::scrollUp() {
 	memmove(_textBuf, _textBuf + TEXT_WIDTH, TEXT_BUF_SIZE - TEXT_WIDTH);
-	memset(_textBuf + TEXT_BUF_SIZE - TEXT_WIDTH, APPLECHAR(' '), TEXT_WIDTH);
+	memset(_textBuf + TEXT_BUF_SIZE - TEXT_WIDTH, (byte)APPLECHAR(' '), TEXT_WIDTH);
 	if (_cursorPos >= TEXT_WIDTH)
 		_cursorPos -= TEXT_WIDTH;
 }





More information about the Scummvm-git-logs mailing list