[Scummvm-cvs-logs] SF.net SVN: scummvm:[55550] scummvm/trunk/engines/gob

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Wed Jan 26 20:04:24 CET 2011


Revision: 55550
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55550&view=rev
Author:   drmccoy
Date:     2011-01-26 19:04:24 +0000 (Wed, 26 Jan 2011)

Log Message:
-----------
GOB: Use a fake cursor for Addy for now :P

Modified Paths:
--------------
    scummvm/trunk/engines/gob/draw_v2.cpp
    scummvm/trunk/engines/gob/inter_v7.cpp
    scummvm/trunk/engines/gob/video.cpp

Modified: scummvm/trunk/engines/gob/draw_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_v2.cpp	2011-01-26 19:04:03 UTC (rev 55549)
+++ scummvm/trunk/engines/gob/draw_v2.cpp	2011-01-26 19:04:24 UTC (rev 55550)
@@ -149,9 +149,13 @@
 				cursorIndex * _cursorWidth, 0,
 				(cursorIndex + 1) * _cursorWidth - 1,
 				_cursorHeight - 1, 0, 0);
-		CursorMan.replaceCursor(_scummvmCursor->getData(),
-				_cursorWidth, _cursorHeight, hotspotX, hotspotY, 0, 1, &_vm->getPixelFormat());
 
+		if ((_vm->getGameType() != kGameTypeAdibou2) &&
+		    (_vm->getGameType() != kGameTypeAdi2) &&
+		    (_vm->getGameType() != kGameTypeAdi4))
+			CursorMan.replaceCursor(_scummvmCursor->getData(),
+					_cursorWidth, _cursorHeight, hotspotX, hotspotY, 0, 1, &_vm->getPixelFormat());
+
 		if (_frontSurface != _backSurface) {
 			if (!_noInvalidated) {
 				int16 tmp = _cursorIndex;

Modified: scummvm/trunk/engines/gob/inter_v7.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v7.cpp	2011-01-26 19:04:03 UTC (rev 55549)
+++ scummvm/trunk/engines/gob/inter_v7.cpp	2011-01-26 19:04:24 UTC (rev 55550)
@@ -26,6 +26,8 @@
 #include "common/endian.h"
 #include "common/archive.h"
 
+#include "graphics/cursorman.h"
+
 #include "gob/gob.h"
 #include "gob/global.h"
 #include "gob/inter.h"
@@ -86,6 +88,22 @@
 	Common::String cursorFile = _vm->_game->_script->getResultStr();
 
 	warning("Addy Stub: Load cursor \"%s\" to %d", cursorFile.c_str(), cursorIndex);
+
+	byte cursor[9];
+	byte palette[6];
+
+	cursor[0] = 0; cursor[1] = 0; cursor[2] = 0;
+	cursor[3] = 0; cursor[4] = 1; cursor[5] = 0;
+	cursor[6] = 0; cursor[7] = 0; cursor[8] = 0;
+
+	palette[0] =   0; palette[1] =   0; palette[2] =   0;
+	palette[3] = 255; palette[4] = 255; palette[5] = 255;
+
+	CursorMan.pushCursorPalette(palette, 0, 2);
+	CursorMan.disableCursorPalette(false);
+	CursorMan.replaceCursor(cursor, 3, 3, 1, 1, 255);
+
+	CursorMan.showMouse(true);
 }
 
 void Inter_v7::o7_displayWarning() {

Modified: scummvm/trunk/engines/gob/video.cpp
===================================================================
--- scummvm/trunk/engines/gob/video.cpp	2011-01-26 19:04:03 UTC (rev 55549)
+++ scummvm/trunk/engines/gob/video.cpp	2011-01-26 19:04:24 UTC (rev 55550)
@@ -227,7 +227,11 @@
 
 void Video::retrace(bool mouse) {
 	if (mouse)
-		CursorMan.showMouse((_vm->_draw->_showCursor & 2) != 0);
+		if ((_vm->getGameType() != kGameTypeAdibou2) &&
+		    (_vm->getGameType() != kGameTypeAdi2) &&
+		    (_vm->getGameType() != kGameTypeAdi4))
+			CursorMan.showMouse((_vm->_draw->_showCursor & 2) != 0);
+
 	if (_vm->_global->_primarySurfDesc) {
 		int screenX = _screenDeltaX;
 		int screenY = _screenDeltaY;


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




More information about the Scummvm-git-logs mailing list