From b06b0ef8722c40e193157d4594dcd4a61fde9b44 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 27 Oct 2015 23:33:23 +0100 Subject: MADS: Janitorial: Remove trailing spaces and tabs --- engines/mads/nebular/game_nebular.cpp | 2 +- engines/mads/nebular/nebular_scenes3.cpp | 2 +- engines/mads/nebular/nebular_scenes5.cpp | 2 +- engines/mads/nebular/nebular_scenes6.cpp | 2 +- engines/mads/nebular/nebular_scenes8.cpp | 2 +- engines/mads/palette.h | 2 +- engines/mads/phantom/phantom_scenes1.cpp | 8 ++++---- engines/mads/phantom/phantom_scenes3.cpp | 4 ++-- engines/mads/player.cpp | 6 +++--- engines/mads/screen.cpp | 12 ++++++------ engines/mads/user_interface.cpp | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) (limited to 'engines/mads') diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp index e8e0a4f42c..578af51f54 100644 --- a/engines/mads/nebular/game_nebular.cpp +++ b/engines/mads/nebular/game_nebular.cpp @@ -350,7 +350,7 @@ void GameNebular::setSectionHandler() { void GameNebular::checkShowDialog() { // Loop for showing dialogs, if any need to be shown - if (_vm->_dialogs->_pendingDialog && (_player._stepEnabled || _winStatus) + if (_vm->_dialogs->_pendingDialog && (_player._stepEnabled || _winStatus) && !_globals[kCopyProtectFailed]) { _player.releasePlayerSprites(); diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp index 717dd85de7..40560357cc 100644 --- a/engines/mads/nebular/nebular_scenes3.cpp +++ b/engines/mads/nebular/nebular_scenes3.cpp @@ -2655,7 +2655,7 @@ void Scene318::enter() { 0x1C8, 0x1C9, 0x1CA, 0x1CB, 0x1CC, 0x1CD, 0x1CE, 0x1CF, 0x1D0, 0x1D1, 0x1D2, 0x1D3, 0x190, 0x19D, 0); - if ((_scene->_priorSceneId == RETURNING_FROM_DIALOG) || (((_scene->_priorSceneId == 318) || + if ((_scene->_priorSceneId == RETURNING_FROM_DIALOG) || (((_scene->_priorSceneId == 318) || (_scene->_priorSceneId == RETURNING_FROM_LOADING)) && (!_globals[kAfterHavoc]))) { if (!_globals[kAfterHavoc]) { _game._player._visible = false; diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp index 092ddeb3f7..76eccf9714 100644 --- a/engines/mads/nebular/nebular_scenes5.cpp +++ b/engines/mads/nebular/nebular_scenes5.cpp @@ -2089,7 +2089,7 @@ void Scene511::actions() { } else { _vm->_dialogs->show(51130); } - } else if (_action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_BOAT) || + } else if (_action.isAction(VERB_TIE, NOUN_FISHING_LINE, NOUN_BOAT) || _action.isAction(VERB_ATTACH, NOUN_FISHING_LINE, NOUN_BOAT)) { if (_globals[kBoatRaised]) _vm->_dialogs->show(51131); diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp index 5b7dae4489..4fa1f77d06 100644 --- a/engines/mads/nebular/nebular_scenes6.cpp +++ b/engines/mads/nebular/nebular_scenes6.cpp @@ -3930,7 +3930,7 @@ void Scene611::enter() { 0x2D9, 0x2DA, 0x2DB, 0x2DC, 0x2DD, 0x2DE, 0x2DF, 0x2E0, 0x2E1, 0x2E2, 0x2E3, 0x2E4, 0x2E5, 0x2E6, 0x323, 0x324, 0); - _dialog1.setup(kConvHermit1, 0x287, 0x288, 0x289, 0x28A, 0x28B, 0x28C, 0x28D, 0x28E, 0x28F, 0x290, + _dialog1.setup(kConvHermit1, 0x287, 0x288, 0x289, 0x28A, 0x28B, 0x28C, 0x28D, 0x28E, 0x28F, 0x290, 0x291, 0x292, 0x293, 0x294, 0x295, 0x296, 0); _dialog2.setup(kConvHermit2, 0x29C, 0x29D, 0x29E, 0x29F, 0); diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp index 3c5cfe37a4..951b270a1c 100644 --- a/engines/mads/nebular/nebular_scenes8.cpp +++ b/engines/mads/nebular/nebular_scenes8.cpp @@ -1606,7 +1606,7 @@ void Scene810::enter() { } void Scene810::step() { - if (_scene->_animation[0] && (_scene->_animation[0]->getCurrentFrame() == 200) + if (_scene->_animation[0] && (_scene->_animation[0]->getCurrentFrame() == 200) && _moveAllowed) { _scene->_sequences.addTimer(100, 70); _moveAllowed = false; diff --git a/engines/mads/palette.h b/engines/mads/palette.h index 6c98947384..1efe63b324 100644 --- a/engines/mads/palette.h +++ b/engines/mads/palette.h @@ -316,7 +316,7 @@ public: void refreshSceneColors(); - static int closestColor(const byte *matchColor, const byte *refPalette, + static int closestColor(const byte *matchColor, const byte *refPalette, int paletteInc, int count); }; diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp index 4aeed5102a..6b05fee5a7 100644 --- a/engines/mads/phantom/phantom_scenes1.cpp +++ b/engines/mads/phantom/phantom_scenes1.cpp @@ -8632,7 +8632,7 @@ void Scene113::handleRaoulAnimation() { if (_scene->_animation[_globals._animationIndexes[3]]->getCurrentFrame() == _raoulFrame) return; - + _raoulFrame = _scene->_animation[_globals._animationIndexes[3]]->getCurrentFrame(); int resetFrame = -1; @@ -9233,7 +9233,7 @@ void Scene114::actions() { case (0): _globals[kPlayerScore] += 5; _game._player._stepEnabled = false; - _game._player._visible = false; + _game._player._visible = false; _globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], false, 6, 2); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 1, 3); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[1], true); @@ -9249,7 +9249,7 @@ void Scene114::actions() { break; case 2: - _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[1]); + _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[1]); _game._player._visible = true; _scene->_sequences.setTimingTrigger(20, 3); break; @@ -9511,7 +9511,7 @@ void Scene150::enter() { _globals._animationIndexes[0] = _scene->loadAnimation(formAnimName('l', 1), 1); else if (_scene->_priorSceneId == 203) { _globals._animationIndexes[0] = _scene->loadAnimation(formAnimName('f', 1), 2); - sceneEntrySound(); + sceneEntrySound(); } else if (_scene->_priorSceneId == 306) _globals._animationIndexes[0] = _scene->loadAnimation(formAnimName('e', 1), 4); else if (_scene->_priorSceneId == 208) diff --git a/engines/mads/phantom/phantom_scenes3.cpp b/engines/mads/phantom/phantom_scenes3.cpp index 92a1f7e0ec..9c028d056e 100644 --- a/engines/mads/phantom/phantom_scenes3.cpp +++ b/engines/mads/phantom/phantom_scenes3.cpp @@ -511,7 +511,7 @@ void Scene302::actions() { } _game._player._stepEnabled = false; - _game._player._visible = false; + _game._player._visible = false; _globals._sequenceIndexes[1] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[1], true, 5, 2); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], 1, 5); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[1], true); @@ -527,7 +527,7 @@ void Scene302::actions() { break; case 2: - _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[1]); + _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[1]); _game._player._visible = true; _scene->_sequences.setTimingTrigger(20, 3); break; diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp index 638cc6956d..292f53815a 100644 --- a/engines/mads/player.cpp +++ b/engines/mads/player.cpp @@ -83,7 +83,7 @@ Player::Player(MADSEngine *vm) _commandsAllowed = false; _enableAtTarget = false; _walkTrigger = 0; - + Common::fill(&_stopWalkerList[0], &_stopWalkerList[12], 0); Common::fill(&_stopWalkerTrigger[0], &_stopWalkerTrigger[12], 0); Common::fill(&_spriteSetsPresent[0], &_spriteSetsPresent[PLAYER_SPRITES_FILE_COUNT], false); @@ -247,8 +247,8 @@ void Player::updateFrame() { Scene &scene = _vm->_game->_scene; assert(scene._sprites[idx] != nullptr); SpriteAsset &spriteSet = *scene._sprites[idx]; - - // WORKAROUND: Certain cutscenes set up player sprites that don't have any + + // WORKAROUND: Certain cutscenes set up player sprites that don't have any // character info. In such cases, simply ignore player updates if (!spriteSet._charInfo) return; diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index 3c27001ae0..c9f5df8b98 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -732,7 +732,7 @@ void ScreenSurface::panTransition(MSurface &newScreen, byte *palData, int entryS srcPos.x + xAt + 1, srcPos.y + size.y)); } else { newScreen.copyRectToSurface(*this, xAt, destPos.y, - Common::Rect(srcPos.x + xAt, srcPos.y, + Common::Rect(srcPos.x + xAt, srcPos.y, srcPos.x + xAt + 1, srcPos.y + size.y)); } @@ -778,8 +778,8 @@ void ScreenSurface::swapForeground(byte newPalette[PALETTE_SIZE], byte *paletteM Common::Rect oldClip = _clipBounds; resetClipBounds(); - - copyRectTranslate(*this, oldMap, Common::Point(0, 0), + + copyRectTranslate(*this, oldMap, Common::Point(0, 0), Common::Rect(0, 0, MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT)); palette.setFullPalette(oldPalette); @@ -789,9 +789,9 @@ void ScreenSurface::swapForeground(byte newPalette[PALETTE_SIZE], byte *paletteM /** * Translates a given palette into a mapping table. * Palettes consist of 128 RGB entries for the foreground and background - * respectively, with the two interleaved together. So the start + * respectively, with the two interleaved together. So the start */ -void ScreenSurface::swapPalette(const byte *palData, byte swapTable[PALETTE_COUNT], +void ScreenSurface::swapPalette(const byte *palData, byte swapTable[PALETTE_COUNT], bool foreground) { int start = foreground ? 1 : 0; const byte *dynamicList = &palData[start * RGB_SIZE]; @@ -807,7 +807,7 @@ void ScreenSurface::swapPalette(const byte *palData, byte swapTable[PALETTE_COUN // Handle the 128 palette entries for the foreground or background for (int idx = 0; idx < (PALETTE_COUNT / 2); ++idx) { if (start >= PALETTE_START && start <= PALETTE_END) { - swapTable[start] = Palette::closestColor(dynamicList, staticList, + swapTable[start] = Palette::closestColor(dynamicList, staticList, 2 * RGB_SIZE, PALETTE_COUNT / 2) * 2 + staticStart; } diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp index 62fd036c03..e4b09ff54c 100644 --- a/engines/mads/user_interface.cpp +++ b/engines/mads/user_interface.cpp @@ -733,7 +733,7 @@ void UserInterface::loadElements() { _categoryIndexes[CAT_HOTSPOT - 1] = _vm->_game->_screenObjects.size() + 1; for (int hotspotIdx = scene._hotspots.size() - 1; hotspotIdx >= 0; --hotspotIdx) { Hotspot &hs = scene._hotspots[hotspotIdx]; - ScreenObject *so = _vm->_game->_screenObjects.add(hs._bounds, SCREENMODE_VGA, + ScreenObject *so = _vm->_game->_screenObjects.add(hs._bounds, SCREENMODE_VGA, CAT_HOTSPOT, hotspotIdx); so->_active = hs._active; } -- cgit v1.2.3