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

sev- sev at scummvm.org
Thu Oct 24 00:16:57 CEST 2013


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:
b64e621883 FULLPIPE: Implement MessageQueue::transferExCommands()


Commit: b64e62188359675c7d6b727bea1da814660723eb
    https://github.com/scummvm/scummvm/commit/b64e62188359675c7d6b727bea1da814660723eb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-23T15:08:24-07:00

Commit Message:
FULLPIPE: Implement MessageQueue::transferExCommands()

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



diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index d58212d..b5f3c7f 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -344,6 +344,13 @@ void MessageQueue::deleteExCommandByIndex(uint idx, bool doFree) {
 		delete *it;
 }
 
+void MessageQueue::transferExCommands(MessageQueue *mq) {
+	while (mq->_exCommands.size()) {
+		_exCommands.push_back(mq->_exCommands.front());
+		mq->_exCommands.pop_front();
+	}
+}
+
 void MessageQueue::sendNextCommand() {
 	if (_exCommands.size()) {
 		if (!(_flags & 4) && (_flags & 1)) {
diff --git a/engines/fullpipe/messages.h b/engines/fullpipe/messages.h
index a3533e1..5238ba7 100644
--- a/engines/fullpipe/messages.h
+++ b/engines/fullpipe/messages.h
@@ -123,6 +123,8 @@ class MessageQueue : public CObject {
 	ExCommand *getExCommandByIndex(uint idx);
 	void deleteExCommandByIndex(uint idx, bool doFree);
 
+	void transferExCommands(MessageQueue *mq);
+
 	void replaceKeyCode(int key1, int key2);
 
 	bool chain(StaticANIObject *ani);






More information about the Scummvm-git-logs mailing list