Ticket #2297: saga-cursor.diff

gfx.cpp

@@ -48 +48 @@
         // Set module data
         _init = 1;
 
-        // For now, always show the mouse cursor.
-        setCursor();
-        _system->showMouse(true);
+        // Start with the cursor shown. It will be hidden before the intro, if
+        // there is an intro. (With boot params, there may not be.)
+        setCursor(kCursorNormal);
+        showCursor(true);
 }
 
 Gfx::~Gfx() {
@@ -390 +391 @@
 }
 
 void Gfx::showCursor(bool state) {
-        updateCursor();
         g_system->showMouse(state);
 }
 

gfx.h

@@ -145 +145 @@
         void getCurrentPal(PalEntry *src_pal);
         void palToBlack(PalEntry *src_pal, double percent);
         void blackToPal(PalEntry *src_pal, double percent);
-        void updateCursor() { setCursor(); }
         void showCursor(bool state);
 
 private:

scene.cpp

@@ -843 +843 @@
 
                 _vm->_events->queue(&event);
 
-                if (getFlags() & kSceneFlagShowCursor) {
-                        // Activate user interface
-                        event.type = kEvTOneshot;
-                        event.code = kInterfaceEvent;
-                        event.op = kEventActivate;
-                        event.time = 0;
-
-                        _vm->_events->queue(&event);
-                }
-
                 // Begin palette cycle animation if present
                 event.type = kEvTOneshot;
                 event.code = kPalAnimEvent;
@@ -861 +851 @@
 
                 q_event = _vm->_events->queue(&event);
 
-                // Show cursor
-                event.type = kEvTOneshot;
-                event.code = kCursorEvent;
-                event.op = kEventShow;
-                _vm->_events->chain(q_event, &event);
-
                 // Start the scene main script
                 if (_sceneDescription.sceneScriptEntrypointNumber > 0) {
                         event.type = kEvTOneshot;
@@ -899 +883 @@
         if (_sceneNumber == ITE_SCENE_PUZZLE)
                 _vm->_puzzle->execute();
 
-        if (_sceneDescription.flags & kSceneFlagShowCursor)
-                _vm->_interface->activate();
-
+        if (getFlags() & kSceneFlagShowCursor) {
+                // Activate user interface
+                event.type = kEvTOneshot;
+                event.code = kInterfaceEvent;
+                event.op = kEventActivate;
+                event.time = 0;
+                _vm->_events->queue(&event);
+        }
 }
 
 void Scene::loadSceneDescriptor(uint32 resourceId) {