diff options
| author | Johannes Schickel | 2006-05-28 11:53:20 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-05-28 11:53:20 +0000 |
| commit | a02f2396598b6cb7512867b1b4a3be9ad99738c6 (patch) | |
| tree | 84328941e00df41d3e987f123d252118b5c4511b | |
| parent | e26285b3f8589d69fbcbe9d49c1f617784a789a2 (diff) | |
| download | scummvm-rg350-a02f2396598b6cb7512867b1b4a3be9ad99738c6.tar.gz scummvm-rg350-a02f2396598b6cb7512867b1b4a3be9ad99738c6.tar.bz2 scummvm-rg350-a02f2396598b6cb7512867b1b4a3be9ad99738c6.zip | |
cleanup
svn-id: r22712
| -rw-r--r-- | engines/kyra/staticres.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index d60d3bf175..153e09a5d1 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -768,11 +768,8 @@ void KyraEngine::loadMainScreen(int page) { loadBitmap("MAIN_ITA.CPS", page, page, 0); else warning("no main graphics file found"); - - uint8 *_pageSrc = _screen->getPagePtr(page); - uint8 *_pageDst = _screen->getPagePtr(0); - memcpy(_pageDst, _pageSrc, 320*200); + _screen->copyRegion(0, 0, 0, 0, 320, 200, page, 0); } const ScreenDim Screen::_screenDimTable[] = { @@ -800,9 +797,7 @@ const ScreenDim Screen::_screenDimTableK3[] = { const int Screen::_screenDimTableCountK3 = ARRAYSIZE(_screenDimTableK3); -// CD Version *could* use an different opcodeTable #define Opcode(x) &KyraEngine::x - void KyraEngine::setupOpcodeTable() { static OpcodeProc opcodeTable[] = { // 0x00 @@ -1086,8 +1081,6 @@ Button *KyraEngine::_buttonDataListPtr[] = { Button KyraEngine::_scrollUpButton = {0, 0x12, 1, 1, 1, 0x483, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x18, 0x0f, 0, 0}; Button KyraEngine::_scrollDownButton = {0, 0x13, 1, 1, 1, 0x483, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x18, 0x0f, 0, 0}; - - Button KyraEngine::_menuButtonData[] = { { 0, 0x0c, /*XXX,*/1, 1, 1, /*XXX,*/ 0x487, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*XXX,*/ 0, 0 /*, XXX*/ }, { 0, 0x0d, /*XXX,*/1, 1, 1, /*XXX,*/ 0x487, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*XXX,*/ 0, 0 /*, XXX*/ }, |