[Scummvm-cvs-logs] SF.net SVN: scummvm: [22712] scummvm/trunk/engines/kyra/staticres.cpp

[lordhoto at users.sourceforge.net]

Revision: 22712
Author:   lordhoto
Date:     2006-05-28 04:53:20 -0700 (Sun, 28 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22712&view=rev

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/staticres.cpp
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2006-05-28 11:52:24 UTC (rev 22711)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2006-05-28 11:53:20 UTC (rev 22712)
@@ -768,11 +768,8 @@
 		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 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::_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*/ },


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.