diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/kyra/sequences_lok.cpp | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/kyra/sequences_lok.cpp')
| -rw-r--r-- | engines/kyra/sequences_lok.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index 2de0565a74..3475402a98 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequences_lok.cpp @@ -381,10 +381,10 @@ void KyraEngine_LoK::seq_createAmuletJewel(int jewel, int page, int noSound, int } } } - _screen->drawShape(page, _shapes[323+jewel], _amuletX2[jewel], _amuletY2[jewel], 0, 0); + _screen->drawShape(page, _shapes[323 + jewel], _amuletX2[jewel], _amuletY2[jewel], 0, 0); _screen->updateScreen(); _screen->showMouse(); - setGameFlag(0x55+jewel); + setGameFlag(0x55 + jewel); } void KyraEngine_LoK::seq_brandonHealing() { @@ -764,7 +764,7 @@ void KyraEngine_LoK::seq_makeBrandonWisp() { if (_flags.platform == Common::kPlatformAmiga) { if ((_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245) || - (_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186)) + (_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186)) _screen->fadePalette(_screen->getPalette(10), 0x54); } else { if (_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245) @@ -1322,7 +1322,7 @@ void KyraEngine_LoK::seq_playCredits() { _screen->copyRegion(0, 32, 0, 32, 320, 128, 4, 2, Screen::CR_NO_P_CHECK); bottom = 0; - for (CreditsLineList::iterator it = lines.begin(); it != lines.end(); ++it) { + for (CreditsLineList::iterator it = lines.begin(); it != lines.end();) { if (it->y < 0) { it = lines.erase(it); continue; @@ -1338,6 +1338,8 @@ void KyraEngine_LoK::seq_playCredits() { it->y--; if (it->y > bottom) bottom = it->y; + + ++it; } _screen->copyRegion(0, 32, 0, 32, 320, 128, 2, 0, Screen::CR_NO_P_CHECK); @@ -1728,7 +1730,7 @@ int KyraEngine_LoK::handleBeadState() { if (_system->getMillis() > _beadStateTimer2 && _malcolmFlag == 7 && !_unkAmuletVar && !_text->printed()) { snd_playSoundEffect(0x0B); if (_currentCharacter->x1 > 233 && _currentCharacter->x1 < 305 && _currentCharacter->y1 > 85 && _currentCharacter->y1 < 105 && - (_brandonStatusBit & 0x20)) { + (_brandonStatusBit & 0x20)) { _beadState1.unk8 = 290; _beadState1.unk9 = 40; _beadStateVar = 5; |