[Scummvm-cvs-logs] scummvm master -> a49ffcd87b23f455cf777f45f734670694a69592

[wjp]

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:
a49ffcd87b LAB: Remove some unnecessary casts


Commit: a49ffcd87b23f455cf777f45f734670694a69592
    https://github.com/scummvm/scummvm/commit/a49ffcd87b23f455cf777f45f734670694a69592
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-12-27T13:52:34+01:00

Commit Message:
LAB: Remove some unnecessary casts

Changed paths:
    engines/lab/dispman.cpp
    engines/lab/intro.cpp
    engines/lab/music.cpp



diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index a332a57..5dba424 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -379,10 +379,10 @@ void DisplayMan::rectFill(Common::Rect fillRect, byte color) {
 		height = _screenHeight - fillRect.top;
 
 	if ((width > 0) && (height > 0)) {
-		char *d = (char *)getCurrentDrawingBuffer() + fillRect.top * _screenWidth + fillRect.left;
+		byte *d = getCurrentDrawingBuffer() + fillRect.top * _screenWidth + fillRect.left;
 
 		while (height-- > 0) {
-			char *dd = d;
+			byte *dd = d;
 			int ww = width;
 
 			while (ww-- > 0) {
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index 537f129..46a20a5 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -83,10 +83,10 @@ void Intro::doPictText(const Common::String filename, bool isScreen) {
 	bool begin = true;
 
 	Common::File *textFile = _vm->_resource->openDataFile(path);
-	byte *textBuffer = new byte[textFile->size()];
+	char *textBuffer = new char[textFile->size()];
 	textFile->read(textBuffer, textFile->size());
 	delete textFile;
-	byte *curText = textBuffer;
+	const char *curText = textBuffer;
 
 	while (1) {
 		if (drawNextText) {
@@ -98,10 +98,10 @@ void Intro::doPictText(const Common::String filename, bool isScreen) {
 			if (isScreen) {
 				_vm->_graphics->rectFillScaled(10, 10, 310, 190, 7);
 
-				curText += _vm->_graphics->flowText(_font, _vm->_isHiRes ? 0 : -1, 5, 7, false, false, true, true, _vm->_utils->vgaRectScale(14, 11, 306, 189), (char *)curText);
+				curText += _vm->_graphics->flowText(_font, _vm->_isHiRes ? 0 : -1, 5, 7, false, false, true, true, _vm->_utils->vgaRectScale(14, 11, 306, 189), curText);
 				_vm->_graphics->fade(true);
 			} else
-				curText += _vm->_graphics->longDrawMessage(Common::String((char *)curText), false);
+				curText += _vm->_graphics->longDrawMessage(Common::String(curText), false);
 
 			doneFl = (*curText == 0);
 
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index ddb6fc9..bdd9d89 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -104,7 +104,7 @@ void Music::playSoundEffect(uint16 sampleSpeed, uint32 length, bool loop, Common
 	byte *soundData = (byte *)malloc(length);
 	dataFile->read(soundData, length);
 
-	Audio::SeekableAudioStream *audioStream = Audio::makeRawStream((const byte *)soundData, length, sampleSpeed, getSoundFlags());
+	Audio::SeekableAudioStream *audioStream = Audio::makeRawStream(soundData, length, sampleSpeed, getSoundFlags());
 	uint loops = (loop) ? 0 : 1;
 	Audio::LoopingAudioStream *loopingAudioStream = new Audio::LoopingAudioStream(audioStream, loops);
 	_vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, loopingAudioStream);
@@ -130,7 +130,7 @@ byte *Music::fillBuffer() {
 	} else {
 		_file->read(musicBuffer, _leftInFile);
 
-		memset((char *)musicBuffer + _leftInFile, 0, MUSICBUFSIZE - _leftInFile);
+		memset(musicBuffer + _leftInFile, 0, MUSICBUFSIZE - _leftInFile);
 
 		_file->seek(0);
 		_leftInFile = _file->size();