[Scummvm-cvs-logs] SF.net SVN: scummvm: [26772] scummvm/trunk/engines/saga

[sev at users.sourceforge.net]

Revision: 26772
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26772&view=rev
Author:   sev
Date:     2007-05-06 23:18:08 -0700 (Sun, 06 May 2007)

Log Message:
-----------
Simplify cursor events management.

Modified Paths:
--------------
    scummvm/trunk/engines/saga/events.cpp
    scummvm/trunk/engines/saga/scene.cpp

Modified: scummvm/trunk/engines/saga/events.cpp
===================================================================
--- scummvm/trunk/engines/saga/events.cpp	2007-05-07 05:06:22 UTC (rev 26771)
+++ scummvm/trunk/engines/saga/events.cpp	2007-05-07 06:18:08 UTC (rev 26772)
@@ -438,10 +438,13 @@
 			_vm->_gfx->showCursor(false);
 			break;
 		case kEventSetNormalCursor:
-			_vm->_gfx->setCursor(kCursorNormal);
+			// in ITE there is just one cursor
+			if (_vm->getGameType() == GType_IHNM)
+				_vm->_gfx->setCursor(kCursorNormal);
 			break;
 		case kEventSetBusyCursor:
-			_vm->_gfx->setCursor(kCursorBusy);
+			if (_vm->getGameType() == GType_IHNM)
+				_vm->_gfx->setCursor(kCursorBusy);
 			break;
 		default:
 			break;

Modified: scummvm/trunk/engines/saga/scene.cpp
===================================================================
--- scummvm/trunk/engines/saga/scene.cpp	2007-05-07 05:06:22 UTC (rev 26771)
+++ scummvm/trunk/engines/saga/scene.cpp	2007-05-07 06:18:08 UTC (rev 26772)
@@ -596,13 +596,11 @@
 	static PalEntry current_pal[PAL_ENTRIES];
 
 	// Change the cursor to an hourglass in IHNM
-	if (_vm->getGameType() == GType_IHNM) {
-		event.type = kEvTOneshot;
-		event.code = kCursorEvent;
-		event.op = kEventSetBusyCursor;
-		event.time = 0;
-		_vm->_events->queue(&event);
-	}
+	event.type = kEvTOneshot;
+	event.code = kCursorEvent;
+	event.op = kEventSetBusyCursor;
+	event.time = 0;
+	_vm->_events->queue(&event);
 
 	if ((_vm->getGameType() == GType_IHNM) && (loadSceneParams->chapter != NO_CHAPTER_CHANGE)) {
 		if (loadSceneParams->loadFlag != kLoadBySceneNumber) {
@@ -901,13 +899,11 @@
 	}
 
 	// Change the cursor back to a crosshair in IHNM
-	if (_vm->getGameType() == GType_IHNM) {
-		event.type = kEvTOneshot;
-		event.code = kCursorEvent;
-		event.op = kEventSetNormalCursor;
-		event.time = 0;
-		_vm->_events->queue(&event);
-	}
+	event.type = kEvTOneshot;
+	event.code = kCursorEvent;
+	event.op = kEventSetNormalCursor;
+	event.time = 0;
+	_vm->_events->queue(&event);
 }
 
 void Scene::loadSceneDescriptor(uint32 resourceId) {


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