aboutsummaryrefslogtreecommitdiff
path: root/engines/lab
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2015-12-27 13:52:34 +0100
committerWillem Jan Palenstijn2015-12-27 13:52:34 +0100
commita49ffcd87b23f455cf777f45f734670694a69592 (patch)
tree0dd54d60125f7893820473be39ed66d6fe23e00f /engines/lab
parent662649319b717632c66df840093eae37849effc4 (diff)
downloadscummvm-rg350-a49ffcd87b23f455cf777f45f734670694a69592.tar.gz
scummvm-rg350-a49ffcd87b23f455cf777f45f734670694a69592.tar.bz2
scummvm-rg350-a49ffcd87b23f455cf777f45f734670694a69592.zip
LAB: Remove some unnecessary casts
Diffstat (limited to 'engines/lab')
-rw-r--r--engines/lab/dispman.cpp4
-rw-r--r--engines/lab/intro.cpp8
-rw-r--r--engines/lab/music.cpp4
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index a332a57e7d..5dba424018 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 537f129863..46a20a502b 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 ddb6fc9613..bdd9d8973f 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();