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

[lordhoto at users.sourceforge.net]

Revision: 41357
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41357&view=rev
Author:   lordhoto
Date:     2009-06-07 22:41:38 +0000 (Sun, 07 Jun 2009)

Log Message:
-----------
Remove unneeded functionality from Screen.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp
    scummvm/trunk/engines/kyra/screen.h

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-06-07 22:34:03 UTC (rev 41356)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-06-07 22:41:38 UTC (rev 41357)
@@ -2560,31 +2560,6 @@
 	_system->updateScreen();
 }
 
-void Screen::copyScreenFromRect(int x, int y, int w, int h, const uint8 *ptr) {
-	x <<= 3; w <<= 3;
-	const uint8 *src = ptr;
-	uint8 *dst = &_pagePtrs[0][y * SCREEN_W + x];
-	for (int i = 0; i < h; ++i) {
-		memcpy(dst, src, w);
-		src += w;
-		dst += SCREEN_W;
-	}
-
-	addDirtyRect(x, y, w, h);
-	clearOverlayRect(0, x, y, w, h);
-}
-
-void Screen::copyScreenToRect(int x, int y, int w, int h, uint8 *ptr) {
-	x <<= 3; w <<= 3;
-	const uint8 *src = &_pagePtrs[0][y * SCREEN_W + x];
-	uint8 *dst = ptr;
-	for (int i = 0; i < h; ++i) {
-		memcpy(dst, src, w);
-		dst += w;
-		src += SCREEN_W;
-	}
-}
-
 uint8 *Screen::getPalette(int num) {
 	assert(num >= 0 && num < (_vm->gameFlags().platform == Common::kPlatformAmiga ? 6 : 4));
 	if (num == 0)

Modified: scummvm/trunk/engines/kyra/screen.h
===================================================================
--- scummvm/trunk/engines/kyra/screen.h	2009-06-07 22:34:03 UTC (rev 41356)
+++ scummvm/trunk/engines/kyra/screen.h	2009-06-07 22:41:38 UTC (rev 41357)
@@ -258,10 +258,6 @@
 	};
 
 	int16 encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size);
-	void restoreMouseRect();
-	void copyMouseToScreen();
-	void copyScreenFromRect(int x, int y, int w, int h, const uint8 *ptr);
-	void copyScreenToRect(int x, int y, int w, int h, uint8 *ptr);
 
 	template<bool noXor> static void wrapped_decodeFrameDelta(uint8 *dst, const uint8 *src);
 	template<bool noXor> static void wrapped_decodeFrameDeltaPage(uint8 *dst, const uint8 *src, const int pitch);


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