[Scummvm-cvs-logs] scummvm master -> fc69e5a71a01626a7a6c4afa75adaacfb8bef2db

[sev-]

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

Summary:
cf6cfc1cf8 FULLPIPE: Implement clearGlobalMessageQueueList1()
fc69e5a71a FULLPIPE: Fix ModalVideoPlayer. Original reacts to more keys


Commit: cf6cfc1cf825451807d9fb31fe5e33eef94c17dc
    https://github.com/scummvm/scummvm/commit/cf6cfc1cf825451807d9fb31fe5e33eef94c17dc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-12T01:12:45-08:00

Commit Message:
FULLPIPE: Implement clearGlobalMessageQueueList1()

Changed paths:
    engines/fullpipe/messages.cpp
    engines/fullpipe/messages.h



diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index b0abe30..7dfdd06 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -683,7 +683,20 @@ void GlobalMessageQueueList::addMessageQueue(MessageQueue *msg) {
 }
 
 void clearGlobalMessageQueueList1() {
-	warning("STUB: clearGlobalMessageQueueList1()");
+	clearMessages();
+
+	g_fp->_globalMessageQueueList->clear();
+}
+
+void clearMessages() {
+	while (g_fp->_exCommandList.size()) {
+		ExCommand *ex = g_fp->_exCommandList.front();
+
+		g_fp->_exCommandList.pop_front();
+
+		if (ex->_excFlags & 2)
+			delete ex;
+	}
 }
 
 bool removeMessageHandler(int16 id, int pos) {
diff --git a/engines/fullpipe/messages.h b/engines/fullpipe/messages.h
index 2e8a29c..33bb827 100644
--- a/engines/fullpipe/messages.h
+++ b/engines/fullpipe/messages.h
@@ -190,6 +190,7 @@ bool insertMessageHandler(int (*callback)(ExCommand *), int index, int16 id);
 void clearMessageHandlers();
 void processMessages();
 void updateGlobalMessageQueue(int id, int objid);
+void clearMessages();
 void clearGlobalMessageQueueList1();
 
 bool chainQueue(int queueId, int flags);


Commit: fc69e5a71a01626a7a6c4afa75adaacfb8bef2db
    https://github.com/scummvm/scummvm/commit/fc69e5a71a01626a7a6c4afa75adaacfb8bef2db
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-12T01:21:12-08:00

Commit Message:
FULLPIPE: Fix ModalVideoPlayer. Original reacts to more keys

Changed paths:
    engines/fullpipe/modal.cpp



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 6db916a..729b403 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -256,7 +256,10 @@ void ModalVideoPlayer::play(const char *filename) {
 
 		Common::Event event;
 		while (g_fp->_system->getEventManager()->pollEvent(event)) {
-			if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || event.type == Common::EVENT_LBUTTONUP)
+			if ((event.type == Common::EVENT_KEYDOWN && (event.kbd.keycode == Common::KEYCODE_ESCAPE ||
+														 event.kbd.keycode == Common::KEYCODE_RETURN ||
+														 event.kbd.keycode == Common::KEYCODE_SPACE))
+				 || event.type == Common::EVENT_LBUTTONUP)
 				skipVideo = true;
 		}