diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index 5a9b6b3b4aa..b7ad42983f9 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -461,11 +461,12 @@ void KyraEngine::seq_demo() { // TODO: Display START.CPS _screen->clearPage(0); - loadBitmap("TOP.CPS", 7, 7, _screen->_currentPalette); + loadBitmap("TOP.CPS", 7, 7, NULL); loadBitmap("BOTTOM.CPS", 5, 5, _screen->_currentPalette); _screen->_curPage = 0; _screen->copyRegion(0, 91, 0, 8, 320, 103, 6, 0); _screen->copyRegion(0, 0, 0, 111, 320, 64, 6, 0); + _system->copyRectToScreen(_screen->getPagePtr(0), 320, 0, 0, 320, 200); _screen->fadeFromBlack(); seq_playSpecialSequence(_seq_demoData_WestwoodLogo, true); @@ -505,7 +506,6 @@ void KyraEngine::seq_intro() { _screen->setFont(Screen::FID_8_FNT); // snd_kyraPlayTheme(0); setTalkCoords(144); - _screen->setScreenPalette(_screen->_currentPalette); for (int i = 0; i < ARRAYSIZE(introProcTable) && !seq_skipSequence(); ++i) { (this->*introProcTable[i])(); } @@ -517,20 +517,21 @@ void KyraEngine::seq_intro() { void KyraEngine::seq_introLogos() { debug(9, "KyraEngine::seq_introLogos()"); _screen->clearPage(0); - loadBitmap("TOP.CPS", 7, 7, _screen->_currentPalette); + loadBitmap("TOP.CPS", 7, 7, NULL); loadBitmap("BOTTOM.CPS", 5, 5, _screen->_currentPalette); _screen->_curPage = 0; _screen->copyRegion(0, 91, 0, 8, 320, 103, 6, 0); _screen->copyRegion(0, 0, 0, 111, 320, 64, 6, 0); + _system->copyRectToScreen(_screen->getPagePtr(0), 320, 0, 0, 320, 200); _screen->fadeFromBlack(); - if (seq_playSpecialSequence(_seq_introData_WestwoodLogo, _skipIntroFlag)) { + if (seq_playSpecialSequence(_seq_floppyData_WestwoodLogo, _skipIntroFlag)) { _screen->fadeToBlack(); _screen->clearPage(0); return; } waitTicks(60); - if (seq_playSpecialSequence(_seq_introData_KyrandiaLogo, _skipIntroFlag)) { + if (seq_playSpecialSequence(_seq_floppyData_KyrandiaLogo, _skipIntroFlag)) { _screen->fadeToBlack(); _screen->clearPage(0); return; @@ -558,7 +559,7 @@ void KyraEngine::seq_introLogos() { waitTicks(1); } while (y2 >= 64); - seq_playSpecialSequence(_seq_introData_Forest, true); + seq_playSpecialSequence(_seq_floppyData_Forest, true); } void KyraEngine::seq_introStory() { @@ -572,7 +573,7 @@ void KyraEngine::seq_introMalcomTree() { debug(9, "KyraEngine::seq_introMalcomTree()"); _screen->_curPage = 0; _screen->clearPage(3); - seq_playSpecialSequence(_seq_introData_MalcomTree, true); + seq_playSpecialSequence(_seq_floppyData_MalcomTree, true); } void KyraEngine::seq_introKallakWriting() { @@ -581,14 +582,14 @@ void KyraEngine::seq_introKallakWriting() { _screen->setAnimBlockPtr(5060); _screen->_charWidth = -2; _screen->clearPage(3); - seq_playSpecialSequence(_seq_introData_KallakWriting, true); + seq_playSpecialSequence(_seq_floppyData_KallakWriting, true); seq_freeHandShapes(); } void KyraEngine::seq_introKallakMalcom() { debug(9, "KyraEngine::seq_introKallakMalcom()"); _screen->clearPage(3); - seq_playSpecialSequence(_seq_introData_KallakMalcom, true); + seq_playSpecialSequence(_seq_floppyData_KallakMalcom, true); } uint8 *KyraEngine::seq_setPanPages(int pageNum, int shape) { diff --git a/kyra/kyra.h b/kyra/kyra.h index f433ef46562..d080cc9bb3b 100644 --- a/kyra/kyra.h +++ b/kyra/kyra.h @@ -180,12 +180,13 @@ protected: static const char *_seq_demo_COLTable[]; // these tables are specific to the floppy version - static const uint8 _seq_introData_Forest[]; - static const uint8 _seq_introData_KallakWriting[]; - static const uint8 _seq_introData_KyrandiaLogo[]; - static const uint8 _seq_introData_KallakMalcom[]; - static const uint8 _seq_introData_MalcomTree[]; - static const uint8 _seq_introData_WestwoodLogo[]; + static const uint8 _seq_floppyData_Forest[]; + static const uint8 _seq_floppyData_KallakWriting[]; + static const uint8 _seq_floppyData_KyrandiaLogo[]; + static const uint8 _seq_floppyData_KallakMalcom[]; + static const uint8 _seq_floppyData_MalcomTree[]; + static const uint8 _seq_floppyData_WestwoodLogo[]; + static const uint8 _seq_codeSizeTable[]; static const char *_seq_WSATable[]; static const char *_seq_CPSTable[]; diff --git a/kyra/staticres.cpp b/kyra/staticres.cpp index 3f8e1d4f710..7f24f915f3d 100644 --- a/kyra/staticres.cpp +++ b/kyra/staticres.cpp @@ -48,7 +48,7 @@ const Screen::DrawShapePlotPixelCallback Screen::_drawShapePlotPixelTable[] = { const int Screen::_drawShapePlotPixelCount = ARRAYSIZE(_drawShapePlotPixelTable); -const uint8 KyraEngine::_seq_introData_Forest[] = { +const uint8 KyraEngine::_seq_floppyData_Forest[] = { 0x00, 0x05, 0x01, 0x00, 0x07, 0x01, 0x1A, 0x02, 0x07, 0x00, 0x00, 0x00, 0x08, 0x02, 0x05, 0x00, 0x98, 0x00, 0x38, 0x0A, 0x00, 0x03, 0x07, 0x16, 0x02, 0x06, 0x09, 0x00, 0x0B, 0x00, 0x41, 0x00, 0x18, 0x16, 0x03, 0x07, 0x02, 0x05, 0x01, 0x98, 0x00, 0x38, 0x16, 0x02, 0x16, 0x03, 0x06, 0x09, @@ -77,7 +77,7 @@ const uint8 KyraEngine::_seq_introData_Forest[] = { 0x13, 0x01, 0x07, 0x01, 0x05, 0x1D }; -const uint8 KyraEngine::_seq_introData_KallakWriting[] = { +const uint8 KyraEngine::_seq_floppyData_KallakWriting[] = { 0x00, 0x00, 0x01, 0x0E, 0x1A, 0x1B, 0x17, 0x00, 0x00, 0x00, 0x3F, 0x01, 0xC7, 0x0C, 0x00, 0x0C, 0x00, 0x19, 0x39, 0x02, 0x00, 0x00, 0x00, 0x00, 0x10, 0x05, 0x00, 0x95, 0x00, 0x20, 0x09, 0x14, 0x0F, 0x2E, 0x02, 0x00, 0x01, 0x00, 0x00, 0x10, 0x05, 0x01, 0x94, 0x00, 0x1B, 0x07, 0x06, 0x00, @@ -208,7 +208,7 @@ const uint8 KyraEngine::_seq_introData_KallakWriting[] = { 0x06, 0x3C, 0x00, 0x13, 0x01, 0x00, 0x1D }; -const uint8 KyraEngine::_seq_introData_KyrandiaLogo[] = { +const uint8 KyraEngine::_seq_floppyData_KyrandiaLogo[] = { 0x15, 0x00, 0x02, 0x00, 0x06, 0x01, 0x1A, 0x02, 0x06, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0x06, 0x06, 0x00, 0x18, 0x14, 0x16, 0x04, 0x0A, 0x00, 0x03, 0x06, 0x16, 0x00, 0x0B, 0x00, 0x0B, 0x00, 0x06, 0x3C, 0x00, 0x18, 0x27, 0x0A, 0x01, 0x03, 0x06, 0x16, 0x00, 0x0B, 0x01, 0x0F, 0x00, 0x06, @@ -217,7 +217,7 @@ const uint8 KyraEngine::_seq_introData_KyrandiaLogo[] = { 0x04, 0x06, 0x16, 0x00, 0x0B, 0x02, 0x0C, 0x00, 0x13, 0x01, 0x06, 0x1D }; -const uint8 KyraEngine::_seq_introData_KallakMalcom[] = { +const uint8 KyraEngine::_seq_floppyData_KallakMalcom[] = { 0x00, 0x04, 0x01, 0x1A, 0x0E, 0x17, 0x00, 0x00, 0x00, 0x3F, 0x01, 0xC7, 0x0C, 0x00, 0x0C, 0x03, 0x0D, 0x00, 0x17, 0x00, 0x00, 0x88, 0x3F, 0x01, 0xC7, 0x0C, 0x02, 0x19, 0x00, 0x02, 0x04, 0x00, 0x10, 0x00, 0x3A, 0x09, 0x19, 0x00, 0x19, 0x3A, 0x14, 0x18, 0x23, 0x0A, 0x00, 0x03, 0x04, 0x07, @@ -259,7 +259,7 @@ const uint8 KyraEngine::_seq_introData_KallakMalcom[] = { 0x00, 0x11, 0x06, 0x3C, 0x00, 0x13, 0x19, 0x01, 0x0E, 0x13, 0x01, 0x04, 0x1D }; -const uint8 KyraEngine::_seq_introData_MalcomTree[] = { +const uint8 KyraEngine::_seq_floppyData_MalcomTree[] = { 0x00, 0x01, 0x00, 0x1A, 0x0E, 0x17, 0x00, 0x00, 0x00, 0x3F, 0x01, 0xC7, 0x0C, 0x00, 0x0C, 0x01, 0x0D, 0x01, 0x09, 0x02, 0x01, 0x00, 0x00, 0x00, 0x10, 0x19, 0x38, 0x09, 0x18, 0x1E, 0x14, 0x18, 0x1F, 0x0A, 0x00, 0x03, 0x01, 0x06, 0x06, 0x00, 0x0B, 0x00, 0x1F, 0x00, 0x18, 0x19, 0x0A, 0x01, @@ -296,7 +296,7 @@ const uint8 KyraEngine::_seq_introData_MalcomTree[] = { 0x01, 0x0E, 0x01, 0x01, 0x13, 0x01, 0x02, 0x1D }; -const uint8 KyraEngine::_seq_introData_WestwoodLogo[] = { +const uint8 KyraEngine::_seq_floppyData_WestwoodLogo[] = { 0x00, 0x03, 0x01, 0x1A, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x16, 0x01, 0x06, 0x06, 0x00, 0x06, 0x3C, 0x00, 0x18, 0x14, 0x0A, 0x00, 0x03, 0x03, 0x16, 0x01, 0x0B, 0x00, 0x08, 0x00, 0x06, 0x3C, 0x00, 0x18, 0x27, 0x0A, 0x01, 0x03, 0x03, 0x16, 0x01, 0x0B, 0x01, 0x0B, 0x00, 0x06, 0x78, 0x00,