[Scummvm-cvs-logs] SF.net SVN: scummvm:[49715] scummvm/trunk/engines/drascula

[sev at users.sourceforge.net]

Revision: 49715
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49715&view=rev
Author:   sev
Date:     2010-06-15 10:22:19 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
Drascula: Move more cursor-related blits to cursorSurface.

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/drascula.cpp
    scummvm/trunk/engines/drascula/graphics.cpp
    scummvm/trunk/engines/drascula/interface.cpp

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2010-06-15 10:21:59 UTC (rev 49714)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2010-06-15 10:22:19 UTC (rev 49715)
@@ -279,6 +279,7 @@
 			loadPic(974, tableSurface);
 
 		if (currentChapter != 2) {
+			loadPic(99, cursorSurface);
 			loadPic(99, backSurface);
 			loadPic(97, extraSurface);
 		}
@@ -507,10 +508,13 @@
 		if (rightMouseButton == 1 && _menuScreen) {
 #endif
 			delay(100);
-			if (currentChapter == 2)
+			if (currentChapter == 2) {
+				loadPic(menuBackground, cursorSurface);
 				loadPic(menuBackground, backSurface);
-			else
+			} else {
+				loadPic(99, cursorSurface);
 				loadPic(99, backSurface);
+			}
 			setPalette((byte *)&gamePalette);
 			_menuScreen = false;
 #ifndef _WIN32_WCE
@@ -535,14 +539,19 @@
 			characterMoved = 0;
 			if (trackProtagonist == 2)
 				trackProtagonist = 1;
-			if (currentChapter == 4)
+			if (currentChapter == 4) {
 				loadPic("icons2.alg", backSurface);
-			else if (currentChapter == 5)
+				loadPic("icons2.alg", cursorSurface);
+			} else if (currentChapter == 5) {
 				loadPic("icons3.alg", backSurface);
-			else if (currentChapter == 6)
+				loadPic("icons3.alg", cursorSurface);
+			} else if (currentChapter == 6) {
 				loadPic("iconsp.alg", backSurface);
-			else
+				loadPic("iconsp.alg", cursorSurface);
+			} else {
 				loadPic("icons.alg", backSurface);
+				loadPic("icons.alg", cursorSurface);
+			}
 			_menuScreen = true;
 #ifndef _WIN32_WCE
 			updateEvents();

Modified: scummvm/trunk/engines/drascula/graphics.cpp
===================================================================
--- scummvm/trunk/engines/drascula/graphics.cpp	2010-06-15 10:21:59 UTC (rev 49714)
+++ scummvm/trunk/engines/drascula/graphics.cpp	2010-06-15 10:22:19 UTC (rev 49715)
@@ -151,8 +151,7 @@
 	free(prevFrame);
 }
 
-void DrasculaEngine::copyBackground(int xorg, int yorg, int xdes, int ydes, int width,
-								  int height, byte *src, byte *dest) {
+void DrasculaEngine::copyBackground(int xorg, int yorg, int xdes, int ydes, int width, int height, byte *src, byte *dest) {
 	dest += xdes + ydes * 320;
 	src += xorg + yorg * 320;
 	/* Unoptimized code

Modified: scummvm/trunk/engines/drascula/interface.cpp
===================================================================
--- scummvm/trunk/engines/drascula/interface.cpp	2010-06-15 10:21:59 UTC (rev 49714)
+++ scummvm/trunk/engines/drascula/interface.cpp	2010-06-15 10:22:19 UTC (rev 49715)
@@ -128,7 +128,7 @@
 							OBJWIDTH, OBJHEIGHT, srcSurface, screenSurface);
 		}
 		copyRect(_x1d_menu[h], _y1d_menu[h], _itemLocations[n].x, _itemLocations[n].y,
-				OBJWIDTH, OBJHEIGHT, backSurface, screenSurface);
+				OBJWIDTH, OBJHEIGHT, cursorSurface, screenSurface);
 	}
 
 	if (x < 7)
@@ -142,7 +142,7 @@
 		if (mouseX > _verbBarX[n] && mouseX < _verbBarX[n + 1])
 			verbActivated = 0;
 		copyRect(OBJWIDTH * n, OBJHEIGHT * verbActivated, _verbBarX[n], 2,
-						OBJWIDTH, OBJHEIGHT, backSurface, screenSurface);
+						OBJWIDTH, OBJHEIGHT, cursorSurface, screenSurface);
 		verbActivated = 1;
 	}
 }


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