diff options
author | Johannes Schickel | 2010-05-17 22:46:53 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-05-17 22:46:53 +0000 |
commit | cbbb78d9f29672e0f78724344040a692018fa3a5 (patch) | |
tree | f332ffc27f9aff633913378ce3628536089291d6 /engines/gob | |
parent | 01070d72d39fba35ca8771055032c2b8a3f141f1 (diff) | |
download | scummvm-rg350-cbbb78d9f29672e0f78724344040a692018fa3a5.tar.gz scummvm-rg350-cbbb78d9f29672e0f78724344040a692018fa3a5.tar.bz2 scummvm-rg350-cbbb78d9f29672e0f78724344040a692018fa3a5.zip |
Enforce conversion formatting on pointer casts in the DEV code.
svn-id: r49068
Diffstat (limited to 'engines/gob')
-rw-r--r-- | engines/gob/dataio.cpp | 8 | ||||
-rw-r--r-- | engines/gob/demos/demoplayer.cpp | 2 | ||||
-rw-r--r-- | engines/gob/draw.h | 2 | ||||
-rw-r--r-- | engines/gob/expression.cpp | 40 | ||||
-rw-r--r-- | engines/gob/goblin.cpp | 14 | ||||
-rw-r--r-- | engines/gob/hotspots.cpp | 2 | ||||
-rw-r--r-- | engines/gob/init.cpp | 6 | ||||
-rw-r--r-- | engines/gob/inter_bargon.cpp | 4 | ||||
-rw-r--r-- | engines/gob/inter_v1.cpp | 12 | ||||
-rw-r--r-- | engines/gob/inter_v2.cpp | 4 | ||||
-rw-r--r-- | engines/gob/inter_v6.cpp | 2 | ||||
-rw-r--r-- | engines/gob/map_v2.cpp | 4 | ||||
-rw-r--r-- | engines/gob/mult.cpp | 4 | ||||
-rw-r--r-- | engines/gob/save/savehandler.cpp | 4 | ||||
-rw-r--r-- | engines/gob/script.cpp | 4 | ||||
-rw-r--r-- | engines/gob/sound/cdrom.cpp | 2 | ||||
-rw-r--r-- | engines/gob/sound/sound.cpp | 2 | ||||
-rw-r--r-- | engines/gob/variables.cpp | 12 | ||||
-rw-r--r-- | engines/gob/video_v6.cpp | 4 | ||||
-rw-r--r-- | engines/gob/videoplayer.cpp | 4 |
20 files changed, 68 insertions, 68 deletions
diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp index 7a7fdba5a2..694cec6a6f 100644 --- a/engines/gob/dataio.cpp +++ b/engines/gob/dataio.cpp @@ -105,17 +105,17 @@ uint32 DataStream::read(void *dataPtr, uint32 dataSize) { return _stream->read(dataPtr, dataSize); if (!_io->isDataFileChunk(_handle)) - return _io->file_getHandle(_handle)->read((byte *) dataPtr, dataSize); + return _io->file_getHandle(_handle)->read((byte *)dataPtr, dataSize); - byte *data = (byte *) dataPtr; + byte *data = (byte *)dataPtr; uint32 haveRead = 0; while (dataSize > 0x3FFF) { - _io->readChunk(_handle, (byte *) data, 0x3FFF); + _io->readChunk(_handle, (byte *)data, 0x3FFF); dataSize -= 0x3FFF; data += 0x3FFF; haveRead += 0x3FFF; } - _io->readChunk(_handle, (byte *) data, dataSize); + _io->readChunk(_handle, (byte *)data, dataSize); return haveRead + dataSize; } diff --git a/engines/gob/demos/demoplayer.cpp b/engines/gob/demos/demoplayer.cpp index da96aecaa6..38e20a46ee 100644 --- a/engines/gob/demos/demoplayer.cpp +++ b/engines/gob/demos/demoplayer.cpp @@ -94,7 +94,7 @@ bool DemoPlayer::play(uint32 index) { case kScriptSourceDirect: { - Common::MemoryReadStream stream((const byte *) script.script, strlen(script.script)); + Common::MemoryReadStream stream((const byte *)script.script, strlen(script.script)); init(); return playStream(stream); diff --git a/engines/gob/draw.h b/engines/gob/draw.h index 68308a416e..8997c53362 100644 --- a/engines/gob/draw.h +++ b/engines/gob/draw.h @@ -178,7 +178,7 @@ public: } void adjustCoords(char adjust, int16 *coord1, int16 *coord2); void adjustCoords(char adjust, uint16 *coord1, uint16 *coord2) { - adjustCoords(adjust, (int16 *) coord1, (int16 *) coord2); + adjustCoords(adjust, (int16 *)coord1, (int16 *)coord2); } int stringLength(const char *str, int16 fontIndex); void drawString(const char *str, int16 x, int16 y, int16 color1, int16 color2, diff --git a/engines/gob/expression.cpp b/engines/gob/expression.cpp index a3cf13ea85..9652862b2f 100644 --- a/engines/gob/expression.cpp +++ b/engines/gob/expression.cpp @@ -77,10 +77,10 @@ int32 Expression::encodePtr(byte *ptr, int type) { offset = _vm->_game->_script->getOffset(ptr); break; case kInterVar: - offset = ptr - ((byte *) _vm->_inter->_variables->getAddressOff8(0)); + offset = ptr - ((byte *)_vm->_inter->_variables->getAddressOff8(0)); break; case kResStr: - offset = ptr - ((byte *) _resultStr); + offset = ptr - ((byte *)_resultStr); break; default: error("Expression::encodePtr(): Unknown pointer type"); @@ -96,10 +96,10 @@ byte *Expression::decodePtr(int32 n) { case kExecPtr: return _vm->_game->_script->getData((n & 0x0FFFFFFF)); case kInterVar: - ptr = (byte *) _vm->_inter->_variables->getAddressOff8(0); + ptr = (byte *)_vm->_inter->_variables->getAddressOff8(0); break; case kResStr: - ptr = (byte *) _resultStr; + ptr = (byte *)_resultStr; break; default: error("Expression::decodePtr(): Unknown pointer type"); @@ -495,7 +495,7 @@ int Expression::cmpHelper(const StackFrame &stackFrame) { } else if (type == OP_LOAD_IMM_STR) { if ((char *)decodePtr(stackFrame.values[-3]) != _resultStr) { strcpy(_resultStr, (char *)decodePtr(stackFrame.values[-3])); - stackFrame.values[-3] = encodePtr((byte *) _resultStr, kResStr); + stackFrame.values[-3] = encodePtr((byte *)_resultStr, kResStr); } cmpTemp = strcmp(_resultStr, (char *)decodePtr(stackFrame.values[-1])); } @@ -727,7 +727,7 @@ void Expression::loadValue(byte operation, uint32 varBase, const StackFrame &sta case OP_LOAD_IMM_STR: *stackFrame.opers = OP_LOAD_IMM_STR; - *stackFrame.values = encodePtr((byte *) _vm->_game->_script->readString(), kExecPtr); + *stackFrame.values = encodePtr((byte *)_vm->_game->_script->readString(), kExecPtr); break; case OP_LOAD_VAR_INT32: @@ -797,11 +797,11 @@ void Expression::simpleArithmetic1(StackFrame &stackFrame) { switch (stackFrame.opers[-1]) { case OP_ADD: if (stackFrame.opers[-2] == OP_LOAD_IMM_STR) { - if ((char *) decodePtr(stackFrame.values[-2]) != _resultStr) { - strcpy(_resultStr, (char *) decodePtr(stackFrame.values[-2])); - stackFrame.values[-2] = encodePtr((byte *) _resultStr, kResStr); + if ((char *)decodePtr(stackFrame.values[-2]) != _resultStr) { + strcpy(_resultStr, (char *)decodePtr(stackFrame.values[-2])); + stackFrame.values[-2] = encodePtr((byte *)_resultStr, kResStr); } - strcat(_resultStr, (char *) decodePtr(stackFrame.values[0])); + strcat(_resultStr, (char *)decodePtr(stackFrame.values[0])); stackFrame.pop(2); } break; @@ -873,12 +873,12 @@ bool Expression::complexArithmetic(Stack &stack, StackFrame &stackFrame, int16 b if (stack.opers[brackStart] == OP_LOAD_IMM_INT16) { stack.values[brackStart] += stackFrame.values[-1]; } else if (stack.opers[brackStart] == OP_LOAD_IMM_STR) { - if ((char *) decodePtr(stack.values[brackStart]) != _resultStr) { - strcpy(_resultStr, (char *) decodePtr(stack.values[brackStart])); + if ((char *)decodePtr(stack.values[brackStart]) != _resultStr) { + strcpy(_resultStr, (char *)decodePtr(stack.values[brackStart])); stack.values[brackStart] = - encodePtr((byte *) _resultStr, kResStr); + encodePtr((byte *)_resultStr, kResStr); } - strcat(_resultStr, (char *) decodePtr(stackFrame.values[-1])); + strcat(_resultStr, (char *)decodePtr(stackFrame.values[-1])); } stackFrame.pop(2); break; @@ -982,8 +982,8 @@ void Expression::getResult(byte operation, int32 value, byte *type) { break; case OP_LOAD_IMM_STR: - if ((char *) decodePtr(value) != _resultStr) - strcpy(_resultStr, (char *) decodePtr(value)); + if ((char *)decodePtr(value) != _resultStr) + strcpy(_resultStr, (char *)decodePtr(value)); break; case OP_LOAD_VAR_INT32: @@ -1113,11 +1113,11 @@ int16 Expression::parseExpr(byte stopToken, byte *type) { if (stackFrame.opers[-3] == OP_LOAD_IMM_INT16) { stackFrame.values[-3] += stackFrame.values[-1]; } else if (stackFrame.opers[-3] == OP_LOAD_IMM_STR) { - if ((char *) decodePtr(stackFrame.values[-3]) != _resultStr) { - strcpy(_resultStr, (char *) decodePtr(stackFrame.values[-3])); - stackFrame.values[-3] = encodePtr((byte *) _resultStr, kResStr); + if ((char *)decodePtr(stackFrame.values[-3]) != _resultStr) { + strcpy(_resultStr, (char *)decodePtr(stackFrame.values[-3])); + stackFrame.values[-3] = encodePtr((byte *)_resultStr, kResStr); } - strcat(_resultStr, (char *) decodePtr(stackFrame.values[-1])); + strcat(_resultStr, (char *)decodePtr(stackFrame.values[-1])); } stackFrame.pop(2); diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp index 34d03d9e8c..11043df782 100644 --- a/engines/gob/goblin.cpp +++ b/engines/gob/goblin.cpp @@ -149,7 +149,7 @@ int16 Goblin::peekGoblin(Gob_Object *_curGob) { ptr = _objList->pHead; index = 0; while (ptr != 0) { - desc = (Gob_Object *) ptr->pData; + desc = (Gob_Object *)ptr->pData; if (desc != _curGob) { for (i = 0; i < 3; i++) { if (desc != _goblins[i]) @@ -220,7 +220,7 @@ void Goblin::drawObjects() { ptr = _objList->pHead; for (ptr = _objList->pHead; ptr != 0; ptr = ptr->pNext) { - objDesc = (Gob_Object *) ptr->pData; + objDesc = (Gob_Object *)ptr->pData; if (objDesc->type == 3) objDesc->toRedraw = 1; @@ -229,7 +229,7 @@ void Goblin::drawObjects() { } for (ptr = _objList->pHead; ptr != 0; ptr = ptr->pNext) { - objDesc = (Gob_Object *) ptr->pData; + objDesc = (Gob_Object *)ptr->pData; if (objDesc->toRedraw == 0) continue; @@ -273,7 +273,7 @@ void Goblin::drawObjects() { sortByOrder(_objList); for (ptr = _objList->pHead; ptr != 0; ptr = ptr->pNext) { - objDesc = (Gob_Object *) ptr->pData; + objDesc = (Gob_Object *)ptr->pData; if (objDesc->toRedraw) { layer = objDesc->stateMach[objDesc->state][objDesc-> @@ -321,7 +321,7 @@ void Goblin::drawObjects() { if ((objDesc->type == 0) && (objDesc->visible != 0)) { for (ptr2 = _objList->pHead; ptr2 != 0; ptr2 = ptr2->pNext) { - gobDesc2 = (Gob_Object *) ptr2->pData; + gobDesc2 = (Gob_Object *)ptr2->pData; if (gobDesc2->toRedraw == 0) continue; @@ -357,7 +357,7 @@ void Goblin::drawObjects() { } for (ptr = _objList->pHead; ptr != 0; ptr = ptr->pNext) { - objDesc = (Gob_Object *) ptr->pData; + objDesc = (Gob_Object *)ptr->pData; if ((objDesc->toRedraw == 0) || (objDesc->type == 1)) continue; @@ -417,7 +417,7 @@ void Goblin::animateObjects() { int16 layer; for (node = _objList->pHead; node != 0; node = node->pNext) { - objDesc = (Gob_Object *) node->pData; + objDesc = (Gob_Object *)node->pData; if ((objDesc->doAnim != 1) || (objDesc->type != 0)) continue; diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp index baa49dc102..abdf513393 100644 --- a/engines/gob/hotspots.cpp +++ b/engines/gob/hotspots.cpp @@ -1352,7 +1352,7 @@ void Hotspots::evaluateNew(uint16 i, uint16 *ids, InputDesc *inputs, uint16 length = _vm->_game->_script->readUint16(); inputs[inputCount].str = - (const char *) (_vm->_game->_script->getData() + _vm->_game->_script->pos()); + (const char *)(_vm->_game->_script->getData() + _vm->_game->_script->pos()); _vm->_game->_script->skip(length); } diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp index 79304419ab..24a8e0a390 100644 --- a/engines/gob/init.cpp +++ b/engines/gob/init.cpp @@ -136,9 +136,9 @@ void Init::initGame() { } else { infBuf = _vm->_dataIO->getData("intro.inf"); - infPtr = (char *) infBuf; + infPtr = (char *)infBuf; - infEnd = (char *) (infBuf + _vm->_dataIO->getDataSize("intro.inf")); + infEnd = (char *)(infBuf + _vm->_dataIO->getDataSize("intro.inf")); for (int i = 0; i < 8; i++, infPtr++) { int j; @@ -185,7 +185,7 @@ void Init::initGame() { _vm->_util->clearPalette(); DataStream *stream = _vm->_dataIO->getDataStream("coktel.clt"); - stream->read((byte *) _vm->_draw->_vgaPalette, 768); + stream->read((byte *)_vm->_draw->_vgaPalette, 768); delete stream; if (_vm->_dataIO->existData("coktel.ims")) { diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp index b955057bac..da8ca103aa 100644 --- a/engines/gob/inter_bargon.cpp +++ b/engines/gob/inter_bargon.cpp @@ -111,7 +111,7 @@ void Inter_Bargon::oBargon_intro2(OpGobParams ¶ms) { _vm->shouldQuit()) { _vm->_palAnim->fade(0, -2, 0); _vm->_video->clearSurf(*_vm->_draw->_frontSurface); - memset((char *) _vm->_draw->_vgaPalette, 0, 768); + memset((char *)_vm->_draw->_vgaPalette, 0, 768); WRITE_VAR(4, buttons); WRITE_VAR(0, kKeyEscape); WRITE_VAR(57, (uint32) -1); @@ -154,7 +154,7 @@ void Inter_Bargon::oBargon_intro3(OpGobParams ¶ms) { _vm->_sound->blasterPlayComposition(comp, 0, samples, 2); for (int i = 0; i < 20; i++) { for (int j = 0; j < 4; j++) { - _vm->_global->_pPaletteDesc->vgaPal = (Video::Color *) palettes[j]; + _vm->_global->_pPaletteDesc->vgaPal = (Video::Color *)palettes[j]; _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc); _vm->_util->longDelay(_vm->_util->getRandom(200)); } diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 7fedcda4bb..805893d8a7 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -468,7 +468,7 @@ void Inter_v1::o1_initMult() { _vm->_mult->_objects[i].pPosY = new VariableReference(*_variables, offPosY); _vm->_mult->_objects[i].pAnimData = - (Mult::Mult_AnimData *) _variables->getAddressOff8(offAnim); + (Mult::Mult_AnimData *)_variables->getAddressOff8(offAnim); _vm->_mult->_objects[i].pAnimData->isStatic = 1; _vm->_mult->_objects[i].tick = 0; @@ -526,7 +526,7 @@ void Inter_v1::o1_loadMultObject() { debugC(4, kDebugGameFlow, "Loading mult object %d", objIndex); - multData = (byte *) _vm->_mult->_objects[objIndex].pAnimData; + multData = (byte *)_vm->_mult->_objects[objIndex].pAnimData; for (int i = 0; i < 11; i++) { if (_vm->_game->_script->peekUint16() != 99) { _vm->_game->_script->evalExpr(&val); @@ -1119,12 +1119,12 @@ bool Inter_v1::o1_palLoad(OpFuncParams ¶ms) { if (!resource) break; - memcpy((char *) _vm->_draw->_vgaPalette, resource->getData(), MIN<int>(768, resource->getSize())); + memcpy((char *)_vm->_draw->_vgaPalette, resource->getData(), MIN<int>(768, resource->getSize())); delete resource; break; case 54: - memset((char *) _vm->_draw->_vgaPalette, 0, 768); + memset((char *)_vm->_draw->_vgaPalette, 0, 768); break; case 61: @@ -1135,7 +1135,7 @@ bool Inter_v1::o1_palLoad(OpFuncParams ¶ms) { if (!resource) break; - memcpy((char *) _vm->_draw->_vgaPalette + index1 * 3, + memcpy((char *)_vm->_draw->_vgaPalette + index1 * 3, resource->getData() + index1 * 3, index2); delete resource; @@ -1778,7 +1778,7 @@ bool Inter_v1::o1_readData(OpFuncParams ¶ms) { if (((dataVar >> 2) == 59) && (size == 4)) WRITE_VAR(59, stream->readUint32LE()); else - retSize = stream->read((byte *) _variables->getAddressOff8(dataVar), size); + retSize = stream->read((byte *)_variables->getAddressOff8(dataVar), size); if (retSize == size) WRITE_VAR(1, 0); diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp index 01b62b72b4..72764eec8d 100644 --- a/engines/gob/inter_v2.cpp +++ b/engines/gob/inter_v2.cpp @@ -344,7 +344,7 @@ void Inter_v2::o2_initMult() { _vm->_mult->_objects[i].pPosY = new VariableReference(*_vm->_inter->_variables, offPosY); _vm->_mult->_objects[i].pAnimData = - (Mult::Mult_AnimData *) _variables->getAddressOff8(offAnim); + (Mult::Mult_AnimData *)_variables->getAddressOff8(offAnim); _vm->_mult->_objects[i].pAnimData->isStatic = 1; _vm->_mult->_objects[i].tick = 0; @@ -409,7 +409,7 @@ void Inter_v2::o2_loadMultObject() { debugC(4, kDebugGameFlow, "Loading mult object %d", objIndex); - multData = (byte *) _vm->_mult->_objects[objIndex].pAnimData; + multData = (byte *)_vm->_mult->_objects[objIndex].pAnimData; for (int i = 0; i < 11; i++) { if (_vm->_game->_script->peekByte() != 99) multData[i] = _vm->_game->_script->readValExpr(); diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index cd4dce9613..cbc831b5a1 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -357,7 +357,7 @@ bool Inter_v6::o6_palLoad(OpFuncParams ¶ms) { o1_palLoad(params); if (_gotFirstPalette) - _vm->_video->_palLUT->setPalette((const byte *) _vm->_global->_pPaletteDesc->vgaPal, + _vm->_video->_palLUT->setPalette((const byte *)_vm->_global->_pPaletteDesc->vgaPal, Graphics::PaletteLUT::kPaletteRGB, 6, 0); _gotFirstPalette = true; diff --git a/engines/gob/map_v2.cpp b/engines/gob/map_v2.cpp index 0e4a00dc0c..e2f9207003 100644 --- a/engines/gob/map_v2.cpp +++ b/engines/gob/map_v2.cpp @@ -85,7 +85,7 @@ void Map_v2::loadMapObjects(const char *avjFile) { _mapUnknownBool = READ_VARO_UINT8(var + 4) ? true : false; break; case 65535: - _passMap = (int8 *) _vm->_inter->_variables->getAddressOff8(var); + _passMap = (int8 *)_vm->_inter->_variables->getAddressOff8(var); break; default: warning("Map_v2::loadMapObjects(): ID == %d", (uint16) id); @@ -156,7 +156,7 @@ void Map_v2::loadMapObjects(const char *avjFile) { if ((variables != 0) && (variables != _vm->_inter->_variables->getAddressOff8(0))) { - _passMap = (int8 *) variables; + _passMap = (int8 *)variables; mapHeight = _screenHeight / _tilesHeight; mapWidth = _screenWidth / _tilesWidth; diff --git a/engines/gob/mult.cpp b/engines/gob/mult.cpp index 883f102ef9..327b3ed1bd 100644 --- a/engines/gob/mult.cpp +++ b/engines/gob/mult.cpp @@ -295,8 +295,8 @@ void Mult::prepPalAnim(bool &stop) { _multData->palAnimIndices[2] = 0; _multData->palAnimIndices[3] = 0; - memcpy((char *) _palAnimPalette, - (char *) _vm->_global->_pPaletteDesc->vgaPal, 768); + memcpy((char *)_palAnimPalette, + (char *)_vm->_global->_pPaletteDesc->vgaPal, 768); _vm->_global->_pPaletteDesc->vgaPal = _palAnimPalette; } } diff --git a/engines/gob/save/savehandler.cpp b/engines/gob/save/savehandler.cpp index 5f24115a6c..14cd82480d 100644 --- a/engines/gob/save/savehandler.cpp +++ b/engines/gob/save/savehandler.cpp @@ -257,7 +257,7 @@ bool TempSpriteHandler::load(int16 dataVar, int32 size, int32 offset) { // Handle palette if (usesPalette(size)) { - if (!_sprite->writePalette((byte *) _vm->_global->_pPaletteDesc->vgaPal)) + if (!_sprite->writePalette((byte *)_vm->_global->_pPaletteDesc->vgaPal)) return false; _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc); @@ -289,7 +289,7 @@ bool TempSpriteHandler::save(int16 dataVar, int32 size, int32 offset) { // Handle palette if (usesPalette(size)) { - if (!_sprite->readPalette((const byte *) _vm->_global->_pPaletteDesc->vgaPal)) + if (!_sprite->readPalette((const byte *)_vm->_global->_pPaletteDesc->vgaPal)) return false; } diff --git a/engines/gob/script.cpp b/engines/gob/script.cpp index e27ecda968..339199c9b1 100644 --- a/engines/gob/script.cpp +++ b/engines/gob/script.cpp @@ -210,7 +210,7 @@ char *Script::readString(int32 length) { while (_totPtr[length++] != '\0') { } } - char *string = (char *) _totPtr; + char *string = (char *)_totPtr; _totPtr += length; @@ -262,7 +262,7 @@ int32 Script::peekInt32(int32 offset) { } char *Script::peekString(int32 offset) { - return (char *) (_totPtr + offset); + return (char *)(_totPtr + offset); } int16 Script::readVarIndex(uint16 *size, uint16 *type) { diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp index 68cbb1b9e2..8f0b1df23e 100644 --- a/engines/gob/sound/cdrom.cpp +++ b/engines/gob/sound/cdrom.cpp @@ -187,7 +187,7 @@ byte *CDROM::getTrackBuffer(const char *trackName) const { byte *curPtr = _LICbuffer; for (int i = 0; i < _numTracks; i++) { - if (!scumm_stricmp((char *) curPtr, trackName)) { + if (!scumm_stricmp((char *)curPtr, trackName)) { matchPtr = curPtr; break; } diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp index a0add6f0b6..f2b9004a41 100644 --- a/engines/gob/sound/sound.cpp +++ b/engines/gob/sound/sound.cpp @@ -122,7 +122,7 @@ bool Sound::sampleLoad(SoundDesc *sndDesc, SoundType type, const char *fileName, byte *data; uint32 size; - data = (byte *) _vm->_dataIO->getData(fileName); + data = (byte *)_vm->_dataIO->getData(fileName); if (!data) return false; diff --git a/engines/gob/variables.cpp b/engines/gob/variables.cpp index 572cba0796..11c5f08bb2 100644 --- a/engines/gob/variables.cpp +++ b/engines/gob/variables.cpp @@ -80,7 +80,7 @@ void Variables::writeOff32(uint32 offset, uint32 value) { } void Variables::writeOffString(uint32 offset, const char *value) { - strcpy((char *) (_vars + offset), value); + strcpy((char *)(_vars + offset), value); } uint8 Variables::readVar8(uint32 var) const { @@ -112,7 +112,7 @@ uint32 Variables::readOff32(uint32 offset) const { } void Variables::readOffString(uint32 offset, char *value, uint32 length) { - strncpy0(value, (const char *) (_vars + offset), length - 1); + strncpy0(value, (const char *)(_vars + offset), length - 1); } const uint8 *Variables::getAddressVar8(uint32 var) const { @@ -132,19 +132,19 @@ char *Variables::getAddressVarString(uint32 var) { } const uint8 *Variables::getAddressOff8(uint32 offset) const { - return ((const uint8 *) (_vars + offset)); + return ((const uint8 *)(_vars + offset)); } uint8 *Variables::getAddressOff8(uint32 offset) { - return ((uint8 *) (_vars + offset)); + return ((uint8 *)(_vars + offset)); } const char *Variables::getAddressOffString(uint32 offset) const { - return ((const char *) (_vars + offset)); + return ((const char *)(_vars + offset)); } char *Variables::getAddressOffString(uint32 offset) { - return ((char *) (_vars + offset)); + return ((char *)(_vars + offset)); } bool Variables::copyTo(uint32 offset, byte *variables, uint32 n) const { diff --git a/engines/gob/video_v6.cpp b/engines/gob/video_v6.cpp index 6f39edb588..7285cd8958 100644 --- a/engines/gob/video_v6.cpp +++ b/engines/gob/video_v6.cpp @@ -39,8 +39,8 @@ Video_v6::Video_v6(GobEngine *vm) : Video_v2(vm) { } void Video_v6::setPrePalette() { - byte *tpal = (byte *) _vm->_draw->_vgaPalette; - const byte *fpal = (const byte *) _ditherPalette; + byte *tpal = (byte *)_vm->_draw->_vgaPalette; + const byte *fpal = (const byte *)_ditherPalette; for (int i = 0; i < 256; i++) { byte r, g, b; diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index ec3901415a..125edd4307 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -374,7 +374,7 @@ bool VideoPlayer::primaryPlay(int16 startFrame, int16 lastFrame, int16 breakKey, if (b) { _vm->_palAnim->fade(0, -2, 0); - memset((char *) _vm->_draw->_vgaPalette, 0, 768); + memset((char *)_vm->_draw->_vgaPalette, 0, 768); } if (!_noCursorSwitch) @@ -759,7 +759,7 @@ void VideoPlayer::copyPalette(Graphics::CoktelVideo &video, int16 palStart, int1 if (palEnd < 0) palEnd = 255; - memcpy(((char *) (_vm->_global->_pPaletteDesc->vgaPal)) + palStart * 3, + memcpy(((char *)(_vm->_global->_pPaletteDesc->vgaPal)) + palStart * 3, video.getPalette() + palStart * 3, (palEnd - palStart + 1) * 3); } |