[Scummvm-cvs-logs] SF.net SVN: scummvm:[33638] scummvm/branches/branch-0-12-0/engines/cine/ various.cpp

buddha_ at users.sourceforge.net buddha_ at users.sourceforge.net
Tue Aug 5 15:06:13 CEST 2008


Revision: 33638
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33638&view=rev
Author:   buddha_
Date:     2008-08-05 13:06:13 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
(Backport of r33637) Fix prompt updating regression introduced in r32257:
Previously prompt didn't get updated all the time,
like e.g. when selecting EXAMINE and moving the
cursor over to DOOR and then moving the cursor to
a place where there was no selectable object. The
prompt would've still shown "EXAMINE DOOR", now
it shows just "EXAMINE" which is correct AFAIK.

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/cine/various.cpp

Modified: scummvm/branches/branch-0-12-0/engines/cine/various.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/cine/various.cpp	2008-08-05 12:58:23 UTC (rev 33637)
+++ scummvm/branches/branch-0-12-0/engines/cine/various.cpp	2008-08-05 13:06:13 UTC (rev 33638)
@@ -1110,6 +1110,7 @@
 	}
 
 	if (!disableSystemMenu) {
+		isDrawCommandEnabled = 1;
 		renderer->setCommand(commandBuffer);
 	}
 }
@@ -1282,6 +1283,11 @@
 	}
 
 	if (allowPlayerInput) {
+		if (isDrawCommandEnabled) {
+			renderer->setCommand(commandBuffer);
+			isDrawCommandEnabled = 0;
+		}
+
 		getMouseData(mouseUpdateStatus, &mouseButton, &mouseX, &mouseY);
 
 		while (mouseButton && currentEntry < 200) {


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