diff options
Diffstat (limited to 'engines')
30 files changed, 63 insertions, 63 deletions
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp index 2cebc3e3c6..d8f2ab492d 100644 --- a/engines/access/scripts.cpp +++ b/engines/access/scripts.cpp @@ -152,7 +152,7 @@ void Scripts::searchForSequence() { _data->seek(0); int sequenceId; do { - while (_data->readByte() != SCRIPT_START_BYTE) ; + while (_data->readByte() != SCRIPT_START_BYTE); sequenceId = _data->readUint16LE(); } while (sequenceId != _sequence); } diff --git a/engines/bladerunner/audio_speech.cpp b/engines/bladerunner/audio_speech.cpp index 87f73737d4..5ffde9db6c 100644 --- a/engines/bladerunner/audio_speech.cpp +++ b/engines/bladerunner/audio_speech.cpp @@ -110,7 +110,7 @@ void AudioSpeech::stopSpeech() { bool AudioSpeech::isPlaying() const { if (_channel == -1) { - return false; + return false; } return _isActive; } diff --git a/engines/bladerunner/screen_effects.h b/engines/bladerunner/screen_effects.h index ad0fb5090f..d16f1cf284 100644 --- a/engines/bladerunner/screen_effects.h +++ b/engines/bladerunner/screen_effects.h @@ -39,12 +39,12 @@ class ScreenEffects { public: struct Entry { Color256 palette[16]; - uint16 x; - uint16 y; - uint16 width; - uint16 height; - uint16 z; - uint8 *data; + uint16 x; + uint16 y; + uint16 width; + uint16 height; + uint16 z; + uint8 *data; }; BladeRunnerEngine *_vm; @@ -58,7 +58,7 @@ public: ~ScreenEffects(); void readVqa(Common::SeekableReadStream *stream); - void getColor(Color256 *outColor, uint16 x, uint16 y, uint16 z) const ; + void getColor(Color256 *outColor, uint16 x, uint16 y, uint16 z) const; //TODO //bool isAffectingArea(int x, int y, int width, int height, int unk); diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp index 4d3a103663..a7e065fe01 100644 --- a/engines/cge/vga13h.cpp +++ b/engines/cge/vga13h.cpp @@ -707,7 +707,7 @@ uint8 Vga::closest(Dac *pal, const uint8 colR, const uint8 colG, const uint8 col uint16 D = ((r > R) ? (r - R) : (R - r)) + ((g > G) ? (g - G) : (G - g)) + ((b > B) ? (b - B) : (B - b)) + - ((l > L) ? (l - L) : (L - l)) * 10 ; + ((l > L) ? (l - L) : (L - l)) * 10; if (D < dif) { found = i; diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp index 8b0d8b6c77..8b8acb6ade 100644 --- a/engines/cge2/vga13h.cpp +++ b/engines/cge2/vga13h.cpp @@ -938,13 +938,13 @@ uint8 Vga::closest(Dac *pal, const uint8 colR, const uint8 colG, const uint8 col uint16 D = ((r > R) ? (r - R) : (R - r)) + ((g > G) ? (g - G) : (G - g)) + ((b > B) ? (b - B) : (B - b)) + - ((l > L) ? (l - L) : (L - l)) * 10 ; + ((l > L) ? (l - L) : (L - l)) * 10; if (D < dif) { found = i; dif = D; if (D == 0) - break; // exact! + break; // exact! } } return found; diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index 103d9fde9e..220b4bbb41 100644 --- a/engines/cryo/eden.cpp +++ b/engines/cryo/eden.cpp @@ -2321,7 +2321,7 @@ void EdenGame::my_bulle() { } else if (c >= 0x80 && c < 0x90) SysBeep(1); else if (c >= 0x90 && c < 0xA0) { - while (*textPtr++ != 0xFF) ; + while (*textPtr++ != 0xFF); textPtr--; } else if (c >= 0xA0 && c < 0xC0) _globals->_textToken1 = c & 0xF; @@ -2333,7 +2333,7 @@ void EdenGame::my_bulle() { #ifdef FAKE_DOS_VERSION _globals->_textWidthLimit = c1 + 160; #else - _globals->_textWidthLimit = c1 + _subtitlesXCenter; //TODO: signed? 160 in pc ver + _globals->_textWidthLimit = c1 + _subtitlesXCenter; // TODO: signed? 160 in pc ver #endif else { byte c2 = *textPtr++; diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp index cf8710c64d..9b0015e646 100644 --- a/engines/gnap/gnap.cpp +++ b/engines/gnap/gnap.cpp @@ -979,7 +979,7 @@ int GnapEngine::playSoundC() { if (!_timers[_soundTimerIndexC]) { _timers[_soundTimerIndexC] = getRandom(50) + 150; - soundId = kSoundIdsC[getRandom(7)] ; + soundId = kSoundIdsC[getRandom(7)]; playSound(soundId | 0x10000, false); } return soundId; diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h index 1401d59dae..d214da0944 100644 --- a/engines/kyra/eobcommon.h +++ b/engines/kyra/eobcommon.h @@ -885,7 +885,7 @@ protected: void inflictMonsterDamage(EoBMonsterInPlay *m, int damage, bool giveExperience); void calcAndInflictMonsterDamage(EoBMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect); void calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int savingThrowEffect); - int calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int damageType) ; + int calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int damageType); void inflictCharacterDamage(int charIndex, int damage); bool characterAttackHitTest(int charIndex, int monsterIndex, int item, int attackType); diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp index 6c1bd572e1..3a9a647fa5 100644 --- a/engines/kyra/screen_eob.cpp +++ b/engines/kyra/screen_eob.cpp @@ -499,7 +499,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int16 dX = x - (_dsX1 << 3); int16 dY = y; int16 dW = _dsX2 - _dsX1; - uint8 pixelsPerByte = *src++ ; + uint8 pixelsPerByte = *src++; uint16 dH = *src++; uint16 width = (*src++) << 3; @@ -1211,7 +1211,7 @@ void Screen_EoB::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, ui if (t <= v && (ii == rootColor || ii != i)) { v = t; - col = ii ; + col = ii; } } *dst++ = col; diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp index 53a30d0079..68d6f752e0 100644 --- a/engines/kyra/sequences_darkmoon.cpp +++ b/engines/kyra/sequences_darkmoon.cpp @@ -876,7 +876,7 @@ void DarkMoonEngine::seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *da const uint8 *shp = sq->_shapes[(*++posOld) - 1]; items[i + 1].data = shp; items[i + 1].size = shp[1]; - items[i + 1].x = (dm->w - shp[2]) << 2 ; + items[i + 1].x = (dm->w - shp[2]) << 2; items[i + 1].dataType = 1; delete[] items[i + 1].str; items[i + 1].str = 0; diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp index 942cf16502..7ee1ad7e4b 100644 --- a/engines/kyra/sequences_hof.cpp +++ b/engines/kyra/sequences_hof.cpp @@ -3378,7 +3378,7 @@ void KyraEngine_HoF::seq_showStarcraftLogo() { int KyraEngine_HoF::seq_playIntro() { bool startupSaveLoadable = saveFileLoadable(0); - return SeqPlayer_HOF(this, _screen, _system, startupSaveLoadable).play(kSequenceVirgin, startupSaveLoadable? kSequenceTitle : kSequenceNoLooping); + return SeqPlayer_HOF(this, _screen, _system, startupSaveLoadable).play(kSequenceVirgin, startupSaveLoadable ? kSequenceTitle : kSequenceNoLooping); } int KyraEngine_HoF::seq_playOutro() { diff --git a/engines/lilliput/script.cpp b/engines/lilliput/script.cpp index 5377806c71..07911f945f 100644 --- a/engines/lilliput/script.cpp +++ b/engines/lilliput/script.cpp @@ -1222,7 +1222,7 @@ void LilliputScript::listAllTexts() { int index = _vm->_packedStringIndex[i]; int variantCount = 0; while (_vm->_packedStrings[index + variantCount] == 0x5B) - ++variantCount ; + ++variantCount; /* int it = 0; if (variantCount != 0) { diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp index a4c6a3ebe1..8b7eb1a9ec 100644 --- a/engines/mads/nebular/nebular_scenes4.cpp +++ b/engines/mads/nebular/nebular_scenes4.cpp @@ -2443,7 +2443,7 @@ void Scene405::step() { } if (_game._trigger == 70) { - _game._player._priorTimer = _scene->_frameStartTime + _game._player._ticksAmount ; + _game._player._priorTimer = _scene->_frameStartTime + _game._player._ticksAmount; _game._player._visible = true; _globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 71); @@ -2458,7 +2458,7 @@ void Scene405::step() { } if (_game._trigger == 75) { - _game._player._priorTimer = _scene->_frameStartTime + _game._player._ticksAmount ; + _game._player._priorTimer = _scene->_frameStartTime + _game._player._ticksAmount; _game._player._visible = true; _scene->_sequences.remove(_globals._sequenceIndexes[1]); _globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 6, 1, 0, 0); diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp index e6b196c4cd..250d2914b7 100644 --- a/engines/saga/interface.cpp +++ b/engines/saga/interface.cpp @@ -2804,8 +2804,8 @@ void Interface::mapPanelDrawCrossHair() { if (screen.contains(mapPosition)) { _vm->_sprite->draw(_vm->_sprite->_mainSprites, - _mapPanelCrossHairState? RID_ITE_SPR_CROSSHAIR : RID_ITE_SPR_CROSSHAIR + 1, - mapPosition, 256); + _mapPanelCrossHairState ? RID_ITE_SPR_CROSSHAIR : RID_ITE_SPR_CROSSHAIR + 1, + mapPosition, 256); } } diff --git a/engines/scumm/he/moonbase/ai_main.cpp b/engines/scumm/he/moonbase/ai_main.cpp index c391105658..c5c1f6a8e4 100644 --- a/engines/scumm/he/moonbase/ai_main.cpp +++ b/engines/scumm/he/moonbase/ai_main.cpp @@ -2811,9 +2811,9 @@ int AI::simulateBuildingLaunch(int x, int y, int power, int angle, int numSteps, numSteps = 1; if (!sXSpeed && !sYSpeed) { - sZSpeed = (static_cast<int>(.70711 * power)) ; - sXSpeed = (static_cast<int>(cos(degToRad(angle)) * sZSpeed)) ; - sYSpeed = (static_cast<int>(sin(degToRad(angle)) * sZSpeed)) ; + sZSpeed = (static_cast<int>(.70711 * power)); + sXSpeed = (static_cast<int>(cos(degToRad(angle)) * sZSpeed)); + sYSpeed = (static_cast<int>(sin(degToRad(angle)) * sZSpeed)); sZSpeed *= SCALE_Z; @@ -2959,9 +2959,9 @@ int AI::simulateWeaponLaunch(int x, int y, int power, int angle, int numSteps) { if (!numSteps) numSteps = 1; if (!sXSpeed && !sYSpeed) { - sZSpeed = (static_cast<int>(.70711 * power)) ; - sXSpeed = (static_cast<int>(cos(degToRad(angle)) * sZSpeed)) ; - sYSpeed = (static_cast<int>(sin(degToRad(angle)) * sZSpeed)) ; + sZSpeed = (static_cast<int>(.70711 * power)); + sXSpeed = (static_cast<int>(cos(degToRad(angle)) * sZSpeed)); + sYSpeed = (static_cast<int>(sin(degToRad(angle)) * sZSpeed)); sZSpeed *= SCALE_Z; diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp index c53e537bb8..112655648a 100644 --- a/engines/sherlock/image_file.cpp +++ b/engines/sherlock/image_file.cpp @@ -703,7 +703,7 @@ void ImageFile3DO::load3DOCelRoomData(Common::SeekableReadStream &stream) { error("load3DOCelRoomData: expected cel data, not enough bytes"); // read data into memory - byte *celDataPtr = new byte[celDataSize]; + byte *celDataPtr = new byte[celDataSize]; stream.read(celDataPtr, celDataSize); streamLeft -= celDataSize; @@ -936,15 +936,15 @@ void ImageFile3DO::loadFont(Common::SeekableReadStream &stream) { stream.read(bitsTablePtr, bitsTableSize); // Now extract all characters - uint16 curChar = 0; - const byte *curBitsLinePtr = bitsTablePtr; - const byte *curBitsPtr = NULL; - byte curBitsLeft = 0; - uint32 curCharHeightLeft = 0; - uint32 curCharWidthLeft = 0; - byte curBits = 0; - byte curBitsReversed = 0; - byte curPosX = 0; + uint16 curChar = 0; + const byte *curBitsLinePtr = bitsTablePtr; + const byte *curBitsPtr = NULL; + byte curBitsLeft = 0; + uint32 curCharHeightLeft = 0; + uint32 curCharWidthLeft = 0; + byte curBits = 0; + byte curBitsReversed = 0; + byte curPosX = 0; assert(bitsTableSize >= (header_maxChar * header_fontHeight * header_bytesPerLine)); // Security diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp index cef7157034..20b811ea98 100644 --- a/engines/sherlock/music.cpp +++ b/engines/sherlock/music.cpp @@ -182,8 +182,8 @@ bool MidiParser_SH::loadMusic(byte *musData, uint32 musDataSize) { _musData = musData; _musDataSize = musDataSize; - byte *headerPtr = _musData + 12; // skip over the already checked SPACE header - byte *pos = headerPtr; + byte *headerPtr = _musData + 12; // skip over the already checked SPACE header + byte *pos = headerPtr; uint16 headerSize = READ_LE_UINT16(headerPtr); assert(headerSize == 0x7F); // Security check diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h index 25ccddedbb..6f1148e956 100644 --- a/engines/sherlock/objects.h +++ b/engines/sherlock/objects.h @@ -470,7 +470,7 @@ struct SceneImage { int _filesize; // File size SceneImage(); -} ; +}; } // End of namespace Sherlock diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp index fc3c2e6574..458cc1a9c2 100644 --- a/engines/sherlock/tattoo/tattoo_people.cpp +++ b/engines/sherlock/tattoo/tattoo_people.cpp @@ -39,7 +39,7 @@ struct AdjustWalk { int _xAdjust; int _flipXAdjust; int _yAdjust; -} ; +}; static const AdjustWalk ADJUST_WALKS[NUM_ADJUSTED_WALKS] = { { "TUPRIGHT", -7, -19, 6 }, diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp index 19aa937f64..8195fc53f9 100644 --- a/engines/sludge/builtin.cpp +++ b/engines/sludge/builtin.cpp @@ -195,7 +195,7 @@ builtIn(howFrozen) { builtIn(setCursor) { UNUSEDALL - PersonaAnimation *aa = getAnimationFromVar(fun->stack->thisVar); + PersonaAnimation *aa = getAnimationFromVar(fun->stack->thisVar); g_sludge->_cursorMan->pickAnimCursor(aa); trimStack(fun->stack); return BR_CONTINUE; @@ -400,7 +400,7 @@ builtIn(pasteImage) { if (!getValueType(x, SVT_INT, fun->stack->thisVar)) return BR_ERROR; trimStack(fun->stack); - PersonaAnimation *pp = getAnimationFromVar(fun->stack->thisVar); + PersonaAnimation *pp = getAnimationFromVar(fun->stack->thisVar); trimStack(fun->stack); if (pp == NULL) return BR_CONTINUE; @@ -1581,7 +1581,7 @@ builtIn(pasteCharacter) { builtIn(animate) { UNUSEDALL int obj; - PersonaAnimation *pp = getAnimationFromVar(fun->stack->thisVar); + PersonaAnimation *pp = getAnimationFromVar(fun->stack->thisVar); if (pp == NULL) return BR_ERROR; trimStack(fun->stack); diff --git a/engines/sludge/event.h b/engines/sludge/event.h index 015e9ea1cb..c07f7b87ad 100644 --- a/engines/sludge/event.h +++ b/engines/sludge/event.h @@ -69,7 +69,7 @@ public: int &mouseY() { return _input.mouseY; } // Events - void setEventFunction(EventFunctions event, int funcNum) { _currentEvents->func[event] = funcNum; } ; + void setEventFunction(EventFunctions event, int funcNum) { _currentEvents->func[event] = funcNum; }; void loadHandlers(Common::SeekableReadStream *stream); void saveHandlers(Common::WriteStream *stream); bool freeze(FrozenStuffStruct *frozenStuff); diff --git a/engines/sludge/freeze.cpp b/engines/sludge/freeze.cpp index cbafa40bdc..9f8c85e828 100644 --- a/engines/sludge/freeze.cpp +++ b/engines/sludge/freeze.cpp @@ -85,7 +85,7 @@ bool GraphicsManager::freeze() { _vm->_peopleMan->freeze(newFreezer); - StatusStuff *newStatusStuff = new StatusStuff ; + StatusStuff *newStatusStuff = new StatusStuff; if (!checkNew(newStatusStuff)) return false; newFreezer->frozenStatus = copyStatusBarStuff(newStatusStuff); diff --git a/engines/sludge/freeze.h b/engines/sludge/freeze.h index 647ccc9fc8..6dd77db17e 100644 --- a/engines/sludge/freeze.h +++ b/engines/sludge/freeze.h @@ -30,7 +30,7 @@ struct OnScreenPerson; struct PersonaAnimation; struct ScreenRegion; struct SpeechStruct; -struct StatusStuff ; +struct StatusStuff; struct EventHandlers; struct ScreenRegion; diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp index 9d0a0088b5..017be432ab 100644 --- a/engines/sludge/loadsave.cpp +++ b/engines/sludge/loadsave.cpp @@ -257,7 +257,7 @@ bool loadVariable(Variable *to, Common::SeekableReadStream *stream) { return true; case SVT_ANIM: - to->varData.animHandler = new PersonaAnimation ; + to->varData.animHandler = new PersonaAnimation; if (!checkNew(to->varData.animHandler)) return false; to->varData.animHandler->load(stream); diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp index 7a70e62457..625f5b7bcb 100644 --- a/engines/sludge/people.cpp +++ b/engines/sludge/people.cpp @@ -175,7 +175,7 @@ bool Persona::load(Common::SeekableReadStream *stream) { if (!checkNew(animation)) return false; for (a = 0; a < numDirections * 3; a++) { - animation[a] = new PersonaAnimation ; + animation[a] = new PersonaAnimation; if (!checkNew(animation[a])) return false; @@ -1088,7 +1088,7 @@ bool PeopleManager::loadPeople(Common::SeekableReadStream *stream) { if (!checkNew(me->myPersona)) return false; - me->myAnim = new PersonaAnimation ; + me->myAnim = new PersonaAnimation; if (!checkNew(me->myAnim)) return false; diff --git a/engines/sludge/statusba.cpp b/engines/sludge/statusba.cpp index 04fa18e957..fc0f065ea9 100644 --- a/engines/sludge/statusba.cpp +++ b/engines/sludge/statusba.cpp @@ -37,8 +37,8 @@ namespace Sludge { SpritePalette verbLinePalette; SpritePalette litVerbLinePalette; -StatusStuff mainStatus; -StatusStuff *nowStatus = & mainStatus; +StatusStuff mainStatus; +StatusStuff *nowStatus = & mainStatus; void setLitStatus(int i) { nowStatus->litStatus = i; @@ -144,7 +144,7 @@ StatusStuff *copyStatusBarStuff(StatusStuff *here) { here->litStatus = -1; here->firstStatusBar = NULL; - StatusStuff *old = nowStatus; + StatusStuff *old = nowStatus; nowStatus = here; return old; diff --git a/engines/supernova/screen.cpp b/engines/supernova/screen.cpp index 5404b13254..2c441acf7b 100644 --- a/engines/supernova/screen.cpp +++ b/engines/supernova/screen.cpp @@ -339,9 +339,9 @@ void Screen::renderImageSection(const MSNImage *image, int section) { return; Common::Rect sectionRect(image->_section[section].x1, - image->_section[section].y1, - image->_section[section].x2 + 1, - image->_section[section].y2 + 1) ; + image->_section[section].y1, + image->_section[section].x2 + 1, + image->_section[section].y2 + 1); if (image->_filenumber == 1 || image->_filenumber == 2) { sectionRect.setWidth(640); sectionRect.setHeight(480); diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp index be2b20294f..fe553b5fab 100644 --- a/engines/tony/loc.cpp +++ b/engines/tony/loc.cpp @@ -1005,7 +1005,7 @@ void RMCharacter::goTo(CORO_PARAM, RMPoint destcoord, bool bReversed) { _walkCount = 0; if (bReversed) { - while (0) ; + while (0); } int nPatt = getCurPattern(); diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index 1b4e30665c..9e55b99ca1 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -864,7 +864,7 @@ const byte *ThreadResource::cardPerform(const byte *card) { if (cardPerform2(card, id)) { card += subId; card = cardPerform(card); - while (*card++ != 61) ; + while (*card++ != 61); } else { card += subId; while (*card != 61 && *card != 29) diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h index bc267fd656..47099046e9 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h @@ -96,7 +96,7 @@ public: bool setViewport(Rect32 *rect) override { return BaseRenderer::setViewport(rect); } Rect32 getViewPort() override; void modTargetRect(Common::Rect *rect); - void pointFromScreen(Point32 *point) ; + void pointFromScreen(Point32 *point); void pointToScreen(Point32 *point); void dumpData(const char *filename) override; |