diff options
author | Johannes Schickel | 2007-04-27 12:15:47 +0000 |
---|---|---|
committer | Johannes Schickel | 2007-04-27 12:15:47 +0000 |
commit | edd9b31a483c07066537663a01c265d99d69ada7 (patch) | |
tree | 2b17984561146628976a3f6728997d3efde0746d /engines/kyra/sequences_v1.cpp | |
parent | 550a6bbf409bfcff102a7d19e21d3286ae78de66 (diff) | |
download | scummvm-rg350-edd9b31a483c07066537663a01c265d99d69ada7.tar.gz scummvm-rg350-edd9b31a483c07066537663a01c265d99d69ada7.tar.bz2 scummvm-rg350-edd9b31a483c07066537663a01c265d99d69ada7.zip |
Cleanup.
svn-id: r26604
Diffstat (limited to 'engines/kyra/sequences_v1.cpp')
-rw-r--r-- | engines/kyra/sequences_v1.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/kyra/sequences_v1.cpp b/engines/kyra/sequences_v1.cpp index da5cf3ccaf..56e946a526 100644 --- a/engines/kyra/sequences_v1.cpp +++ b/engines/kyra/sequences_v1.cpp @@ -314,7 +314,7 @@ void KyraEngine::seq_createAmuletJewel(int jewel, int page, int noSound, int dra _screen->hideMouse(); if (!drawOnly) { for (int i = 0; specialJewelTable[i] != 0xFFFF; ++i) { - _screen->drawShape(page, _shapes[4+specialJewelTable[i]], _amuletX2[jewel], _amuletY2[jewel], 0, 0); + _screen->drawShape(page, _shapes[specialJewelTable[i]], _amuletX2[jewel], _amuletY2[jewel], 0, 0); _screen->updateScreen(); delayWithTicks(3); } @@ -340,13 +340,13 @@ void KyraEngine::seq_createAmuletJewel(int jewel, int page, int noSound, int dra if (opcodes) { for (int i = 0; opcodes[i] != 0xFFFF; ++i) { - _screen->drawShape(page, _shapes[4+opcodes[i]], _amuletX2[jewel], _amuletY2[jewel], 0, 0); + _screen->drawShape(page, _shapes[opcodes[i]], _amuletX2[jewel], _amuletY2[jewel], 0, 0); _screen->updateScreen(); delayWithTicks(3); } } } - _screen->drawShape(page, _shapes[327+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); @@ -1797,7 +1797,7 @@ void KyraEngine::drawJewelPress(int jewel, int drawSpecial) { shape = jewel + 0x149; snd_playSoundEffect(0x45); - _screen->drawShape(0, _shapes[4+shape], _amuletX2[jewel], _amuletY2[jewel], 0, 0); + _screen->drawShape(0, _shapes[shape], _amuletX2[jewel], _amuletY2[jewel], 0, 0); _screen->updateScreen(); delayWithTicks(2); @@ -1806,7 +1806,7 @@ void KyraEngine::drawJewelPress(int jewel, int drawSpecial) { else shape = jewel + 0x143; - _screen->drawShape(0, _shapes[4+shape], _amuletX2[jewel], _amuletY2[jewel], 0, 0); + _screen->drawShape(0, _shapes[shape], _amuletX2[jewel], _amuletY2[jewel], 0, 0); _screen->updateScreen(); _screen->showMouse(); } @@ -1819,13 +1819,13 @@ void KyraEngine::drawJewelsFadeOutStart() { static const uint16 jewelTable4[] = { 0x165, 0x161, 0x15B, 0x156, 0x151, 0xFFFF }; for (int i = 0; jewelTable1[i] != 0xFFFF; ++i) { if (queryGameFlag(0x57)) - _screen->drawShape(0, _shapes[4+jewelTable1[i]], _amuletX2[2], _amuletY2[2], 0, 0); + _screen->drawShape(0, _shapes[jewelTable1[i]], _amuletX2[2], _amuletY2[2], 0, 0); if (queryGameFlag(0x59)) - _screen->drawShape(0, _shapes[4+jewelTable3[i]], _amuletX2[4], _amuletY2[4], 0, 0); + _screen->drawShape(0, _shapes[jewelTable3[i]], _amuletX2[4], _amuletY2[4], 0, 0); if (queryGameFlag(0x56)) - _screen->drawShape(0, _shapes[4+jewelTable2[i]], _amuletX2[1], _amuletY2[1], 0, 0); + _screen->drawShape(0, _shapes[jewelTable2[i]], _amuletX2[1], _amuletY2[1], 0, 0); if (queryGameFlag(0x58)) - _screen->drawShape(0, _shapes[4+jewelTable4[i]], _amuletX2[3], _amuletY2[3], 0, 0); + _screen->drawShape(0, _shapes[jewelTable4[i]], _amuletX2[3], _amuletY2[3], 0, 0); _screen->updateScreen(); delayWithTicks(3); } @@ -1855,13 +1855,13 @@ void KyraEngine::drawJewelsFadeOutEnd(int jewel) { for (int i = 0; jewelTable[i] != 0xFFFF; ++i) { uint16 shape = jewelTable[i]; if (queryGameFlag(0x57)) - _screen->drawShape(0, _shapes[4+shape], _amuletX2[2], _amuletY2[2], 0, 0); + _screen->drawShape(0, _shapes[shape], _amuletX2[2], _amuletY2[2], 0, 0); if (queryGameFlag(0x59)) - _screen->drawShape(0, _shapes[4+shape], _amuletX2[4], _amuletY2[4], 0, 0); + _screen->drawShape(0, _shapes[shape], _amuletX2[4], _amuletY2[4], 0, 0); if (queryGameFlag(0x56)) - _screen->drawShape(0, _shapes[4+shape], _amuletX2[1], _amuletY2[1], 0, 0); + _screen->drawShape(0, _shapes[shape], _amuletX2[1], _amuletY2[1], 0, 0); if (queryGameFlag(0x58)) - _screen->drawShape(0, _shapes[4+shape], _amuletX2[3], _amuletY2[3], 0, 0); + _screen->drawShape(0, _shapes[shape], _amuletX2[3], _amuletY2[3], 0, 0); _screen->updateScreen(); delayWithTicks(3); |