[Scummvm-cvs-logs] SF.net SVN: scummvm: [26503] scummvm/trunk/engines/agos

[kirben at users.sourceforge.net]

Revision: 26503
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26503&view=rev
Author:   kirben
Date:     2007-04-15 07:43:23 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
Fix mouse regression in Swampy Adventures.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/cursor.cpp

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2007-04-15 14:38:02 UTC (rev 26502)
+++ scummvm/trunk/engines/agos/agos.h	2007-04-15 14:43:23 UTC (rev 26503)
@@ -1566,6 +1566,8 @@
 
 	const OpcodeEntryPuzzlePack *_opcodesPuzzlePack;
 
+	virtual void drawMousePointer();
+
 	virtual void resetVerbs();
 
 	void loadMouseImage();

Modified: scummvm/trunk/engines/agos/cursor.cpp
===================================================================
--- scummvm/trunk/engines/agos/cursor.cpp	2007-04-15 14:38:02 UTC (rev 26502)
+++ scummvm/trunk/engines/agos/cursor.cpp	2007-04-15 14:43:23 UTC (rev 26503)
@@ -502,6 +502,14 @@
 	memcpy(_mouseData, src, _maxCursorWidth * _maxCursorHeight);
 }
 
+void AGOSEngine_PuzzlePack::drawMousePointer() {
+	if (getGameId() == GID_DIMP) {
+		AGOSEngine::drawMousePointer();
+	} else {
+		CursorMan.replaceCursor(_mouseData, _maxCursorWidth, _maxCursorHeight, 37, 48, 0);
+	}
+}
+
 void AGOSEngine_Feeble::drawMousePart(int image, byte x, byte y) {
 	VgaPointersEntry *vpe = &_vgaBufferPointers[7];
 	byte *src;
@@ -586,9 +594,7 @@
 }
 
 void AGOSEngine::drawMousePointer() {
-	if (getGameType() == GType_PP && getGameId() != GID_DIMP) {
-		CursorMan.replaceCursor(_mouseData, _maxCursorWidth, _maxCursorHeight, 37, 48, 0);
-	} else if (getGameType() == GType_SIMON2) {
+	if (getGameType() == GType_SIMON2) {
 		CursorMan.replaceCursor(_simon2_cursors[_mouseCursor], 16, 16, 7, 7);
 	} else if (getGameType() == GType_SIMON1) {
 		CursorMan.replaceCursor(_mouseData, 16, 16, 0, 0, 0xFF);


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