[Scummvm-cvs-logs] scummvm master -> 5d416e7903cd6fb6efa7e6dbdd0bd91aa3fc4de0

fuzzie fuzzie at fuzzie.org
Fri Aug 12 21:01:38 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5d416e7903 COMPOSER: Don't ignore setCursorVisible when there's no cursor yet.


Commit: 5d416e7903cd6fb6efa7e6dbdd0bd91aa3fc4de0
    https://github.com/scummvm/scummvm/commit/5d416e7903cd6fb6efa7e6dbdd0bd91aa3fc4de0
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-08-12T11:58:08-07:00

Commit Message:
COMPOSER: Don't ignore setCursorVisible when there's no cursor yet.

Changed paths:
    engines/composer/composer.cpp



diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index cf773dc..11bf8e8 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -253,16 +253,15 @@ void ComposerEngine::setCursor(uint16 id, const Common::Point &offset) {
 }
 
 void ComposerEngine::setCursorVisible(bool visible) {
-	if (!_mouseSpriteId)
-		return;
-
 	if (visible && !_mouseVisible) {
 		_mouseVisible = true;
-		addSprite(_mouseSpriteId, 0, 0, _lastMousePos - _mouseOffset);
+		if (_mouseSpriteId)
+			addSprite(_mouseSpriteId, 0, 0, _lastMousePos - _mouseOffset);
 		onMouseMove(_lastMousePos);
 	} else if (!visible && _mouseVisible) {
 		_mouseVisible = false;
-		removeSprite(_mouseSpriteId, 0);
+		if (_mouseSpriteId)
+			removeSprite(_mouseSpriteId, 0);
 	}
 }
 






More information about the Scummvm-git-logs mailing list