From 4a302b25adb34e6357506a25cbfba6e182ac9209 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 10 Sep 2007 13:17:20 +0000 Subject: Lots of source code formatting corrections svn-id: r28887 --- engines/lure/detection.cpp | 3 +-- engines/lure/fights.cpp | 3 +-- engines/lure/intro.cpp | 3 +-- engines/lure/lure.cpp | 6 ++---- engines/lure/menu.cpp | 3 +-- engines/lure/res.cpp | 3 +-- engines/lure/screen.cpp | 3 +-- engines/lure/sound.cpp | 3 +-- 8 files changed, 9 insertions(+), 18 deletions(-) (limited to 'engines/lure') diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index b4a69bfd43..d12244af07 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -152,8 +152,7 @@ void LureEngine::detectGame() { "Lure of the Temptress executable. See the documentation for creating it.", SUPPORT_FILENAME); - for (uint8 fileNum = 1; fileNum <= 4; ++fileNum) - { + for (uint8 fileNum = 1; fileNum <= 4; ++fileNum) { char sFilename[10]; sprintf(sFilename, "disk%d.vga", fileNum); diff --git a/engines/lure/fights.cpp b/engines/lure/fights.cpp index 374ea22c26..836c109ca7 100644 --- a/engines/lure/fights.cpp +++ b/engines/lure/fights.cpp @@ -335,8 +335,7 @@ void FightsManager::fightHandler(Hotspot &h, uint16 moveOffset) { return; } - switch (moveValue) - { + switch (moveValue) { case 0xFFFA: // Walk left if ((fighter.fwmove_number == 5) || (fighter.fwmove_number == 10)) { diff --git a/engines/lure/intro.cpp b/engines/lure/intro.cpp index 3f939c6389..41146742b7 100644 --- a/engines/lure/intro.cpp +++ b/engines/lure/intro.cpp @@ -80,8 +80,7 @@ bool Introduction::show() { PaletteCollection coll(0x32); const AnimRecord *curr_anim = anim_screens; - for (; curr_anim->resourceId; ++curr_anim) - { + for (; curr_anim->resourceId; ++curr_anim) { bool fadeIn = curr_anim == anim_screens; anim = new AnimationSequence(_screen, _system, curr_anim->resourceId, coll.getPalette(curr_anim->paletteIndex), fadeIn); diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp index f7c4272f0e..7359ce9fb8 100644 --- a/engines/lure/lure.cpp +++ b/engines/lure/lure.cpp @@ -169,8 +169,7 @@ bool LureEngine::loadGame(uint8 slotNumber) { // Check for header char buffer[5]; f->read(buffer, 5); - if (memcmp(buffer, "lure", 5) != 0) - { + if (memcmp(buffer, "lure", 5) != 0) { warning(FAILED_MSG, slotNumber); delete f; return false; @@ -179,8 +178,7 @@ bool LureEngine::loadGame(uint8 slotNumber) { // Check language version uint8 language = f->readByte(); uint8 version = f->readByte(); - if ((language != _language) || (version != LURE_DAT_MINOR)) - { + if ((language != _language) || (version != LURE_DAT_MINOR)) { warning("loadGame: Failed to load slot %d - incorrect version", slotNumber); delete f; return false; diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index 3bb6769ff7..7dfb6e2a57 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -106,8 +106,7 @@ uint8 Menu::execute() { while (events.pollEvent()) { if (events.quitFlag) return MENUITEM_NONE; - if (mouse.y() < MENUBAR_Y_SIZE) - { + if (mouse.y() < MENUBAR_Y_SIZE) { MenuRecord *p = getMenuAt(mouse.x()); if (_selectedMenu != p) { diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index 44d9d9859f..419101a6ee 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -657,8 +657,7 @@ void Resources::setTalkData(uint16 offset) { error("Unknown talk entry offset %d requested", offset); } -void Resources::saveToStream(Common::WriteStream *stream) -{ +void Resources::saveToStream(Common::WriteStream *stream) { _hotspotData.saveToStream(stream); _activeHotspots.saveToStream(stream); _fieldList.saveToStream(stream); diff --git a/engines/lure/screen.cpp b/engines/lure/screen.cpp index 7e96484b2f..552e609b84 100644 --- a/engines/lure/screen.cpp +++ b/engines/lure/screen.cpp @@ -95,8 +95,7 @@ void Screen::paletteFadeIn(Palette *p) { byte *pFinal = p->data(); byte *pCurrent = _palette->data(); - for (int palCtr = 0; palCtr < p->numEntries() * PALETTE_FADE_INC_SIZE; ++palCtr, ++pCurrent, ++pFinal) - { + for (int palCtr = 0; palCtr < p->numEntries() * PALETTE_FADE_INC_SIZE; ++palCtr, ++pCurrent, ++pFinal) { if (palCtr % PALETTE_FADE_INC_SIZE == (PALETTE_FADE_INC_SIZE - 1)) continue; bool isDifferent = *pCurrent < *pFinal; diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp index 8b927cca9d..b0fb3a54f6 100644 --- a/engines/lure/sound.cpp +++ b/engines/lure/sound.cpp @@ -131,8 +131,7 @@ void SoundManager::addSound2(uint8 soundIndex) { if (soundIndex == 6) // Chinese torture addSound(6); - else - { + else { SoundDescResource &descEntry = soundDescs()[soundIndex]; SoundDescResource *rec = findSound(descEntry.soundNumber); if (rec == NULL) -- cgit v1.2.3