[Scummvm-cvs-logs] SF.net SVN: scummvm:[55616] scummvm/trunk/engines/toon/toon.cpp

sylvaintv at users.sourceforge.net sylvaintv at users.sourceforge.net
Sat Jan 29 17:02:20 CET 2011


Revision: 55616
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55616&view=rev
Author:   sylvaintv
Date:     2011-01-29 16:02:20 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
TOON: Bug #3166570 fixed. Magnifier effect when selecting Enigma book

Bug #3166570: "TOON: Wrong mouse-cursor for Item "Book-Enigma"

Modified Paths:
--------------
    scummvm/trunk/engines/toon/toon.cpp

Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp	2011-01-29 15:27:30 UTC (rev 55615)
+++ scummvm/trunk/engines/toon/toon.cpp	2011-01-29 16:02:20 UTC (rev 55616)
@@ -472,7 +472,7 @@
 void ToonEngine::copyToVirtualScreen(bool updateScreen) {
 	// render cursor last
 	if (!_gameState->_mouseHidden) {
-		if (_cursorAnimationInstance->getFrame() == 7) // magnifier icon needs a special effect
+		if (_cursorAnimationInstance->getFrame() == 7 && _cursorAnimationInstance->getAnimation() == _cursorAnimation) // magnifier icon needs a special effect
 			doMagnifierEffect();
 		_cursorAnimationInstance->setPosition(_mouseX - 40 + state()->_currentScrollValue - _cursorOffsetX, _mouseY - 40 - _cursorOffsetY, 0, false);
 		_cursorAnimationInstance->render();


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