[Scummvm-cvs-logs] SF.net SVN: scummvm:[38900] scummvm/trunk/engines/sci/gfx/operations.cpp

[wjpalenstijn at users.sourceforge.net]

Revision: 38900
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38900&view=rev
Author:   wjpalenstijn
Date:     2009-02-26 12:10:11 +0000 (Thu, 26 Feb 2009)

Log Message:
-----------
Clarify behaviour of gfxop_get_event().

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/operations.cpp

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-02-26 11:32:02 UTC (rev 38899)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-02-26 12:10:11 UTC (rev 38900)
@@ -1473,7 +1473,7 @@
 		event = state->driver->get_event(state->driver);
 		if (event.type)
 			state->events.push_back(event);
-	} while (event.type);
+	} while (event.type != SCI_EVT_NONE);
 
 	// Search for matching event in queue
 	Common::List<sci_event_t>::iterator iter = state->events.begin();
@@ -1488,6 +1488,11 @@
 		if (!(mask & SCI_EVT_PEEK)) {
 			state->events.erase(iter);
 		}
+	} else {
+		// No event found: we must return a SCI_EVT_NONE event.
+
+		// Because event.type is SCI_EVT_NONE already here,
+		// there is no need to change it.
 	}
 
 	_gfxop_full_pointer_refresh(state);


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