diff options
author | Max Horn | 2009-01-29 05:26:12 +0000 |
---|---|---|
committer | Max Horn | 2009-01-29 05:26:12 +0000 |
commit | ac59693be26b4239aaaf380896a1e1b753172546 (patch) | |
tree | b64a9b664917ed86e78e90560b034f0b1ee49054 /engines/kyra | |
parent | a0a82d911c77b63f2069dbc39ab26394fe4d377d (diff) | |
download | scummvm-rg350-ac59693be26b4239aaaf380896a1e1b753172546.tar.gz scummvm-rg350-ac59693be26b4239aaaf380896a1e1b753172546.tar.bz2 scummvm-rg350-ac59693be26b4239aaaf380896a1e1b753172546.zip |
A ton of code formatting fixes; also fixed warnings about single line loops like 'while(cond);' by inserting newlines
svn-id: r36127
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/gui_v2.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/items_lol.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/script_hof.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/sequences_hof.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/sound_towns.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp index 012a5b901b..20ebf8d9aa 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui_v2.cpp @@ -612,7 +612,7 @@ int GUI_v2::saveMenu(Button *caller) { initMenu(*_currentMenu); updateAllMenuButtons(); return 0; - } else if(_saveSlot <= -1) { + } else if (_saveSlot <= -1) { return 0; } diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp index 805df9337b..372fc5809e 100644 --- a/engines/kyra/items_lol.cpp +++ b/engines/kyra/items_lol.cpp @@ -55,7 +55,7 @@ void LoLEngine::giveCredits(int credits, int redraw) { _moneyColumnHeight[d]++; } _credits++; - } while(++cnt < t); + } while (++cnt < t); } else if (_credits >= 60) { _credits += t; } @@ -114,7 +114,7 @@ int LoLEngine::makeItem(int itemIndex, int curFrame, int flags) { slot = r; } else { int ii = _itemsInPlay[slot].itemIndexUnk; - while(ii) { + while (ii) { if (testUnkItemFlags(ii)) { _itemsInPlay[slot].itemIndexUnk = _itemsInPlay[ii].itemIndexUnk; clearItemTableEntry(ii); diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp index 4eb727a617..2a763ad3ae 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script_hof.cpp @@ -946,7 +946,7 @@ int KyraEngine_HoF::o2_useItemOnMainChar(EMCState *script) { int oldVocH = _vocHigh; _vocHigh = 0x5a; - while(_emc->isValid(&tmpScript)) + while (_emc->isValid(&tmpScript)) _emc->run(&tmpScript); _vocHigh = oldVocH; diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp index 7048225891..4cb7040c34 100644 --- a/engines/kyra/sequences_hof.cpp +++ b/engines/kyra/sequences_hof.cpp @@ -2772,7 +2772,7 @@ void KyraEngine_HoF::seq_scrollPage(int bottom, int top) { _screen->fillRect(12, def->y - 8, 28, def->y + 8, 0, 4); _screen->drawShape(4, getShapePtr(def->itemIndex + def->frames[a->currentFrame]), 12, def->y - 8, 0, 0); - if(_seqFrameCounter % 2 == 0) + if (_seqFrameCounter % 2 == 0) a->currentFrame = ++a->currentFrame % 20; } } @@ -2807,7 +2807,7 @@ void KyraEngine_HoF::seq_showStarcraftLogo() { _screen->updateScreen(); delay(_seqEndTime - _system->getMillis()); } - if(!skipFlag()) { + if (!skipFlag()) { _seqEndTime = _system->getMillis() + 50; ci->displayFrame(0, 0); _screen->copyPage(2, 0); diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 0417d4dfc5..8ccbc736f3 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -1932,7 +1932,7 @@ bool TownsPC98_OpnChannel::processVibrato() { _vbrCurDelay = _vbrInitDelayHi; _frequency += _vbrModCurVal; - if(!--_vbrDurLeft) { + if (!--_vbrDurLeft) { _vbrDurLeft = _vbrDuration; _vbrModCurVal = -_vbrModCurVal; } @@ -2425,7 +2425,7 @@ bool TownsPC98_OpnChannelSSG::control_fc_decOutLevel(uint8 para) { if (_drv->_fading) return true; - if(_totalLevel + 1 < 0x10) + if (_totalLevel + 1 < 0x10) _totalLevel++; return true; |