[Scummvm-cvs-logs] scummvm master -> 19fb0d11bcd995c0c6ffd10ab11f82b02100bd8e

[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:
d423b5b1fe FULLPIPE: Implement MGM::getStaticsIndex()
19fb0d11bc FULLPIPE: Implement MessageQueue::insertExCommandAt()


Commit: d423b5b1fef100d5bbb9087ee962c1c22109b656
    https://github.com/scummvm/scummvm/commit/d423b5b1fef100d5bbb9087ee962c1c22109b656
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-08T00:58:26-08:00

Commit Message:
FULLPIPE: Implement MGM::getStaticsIndex()

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



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 42dd60a..dc1b76a 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1882,6 +1882,9 @@ Common::Point *MGM::getPoint(Common::Point *point, int objectId, int staticsId1,
 }
 
 int MGM::getStaticsIndexById(int idx, int16 id) {
+	if (!_items[idx]->statics.size())
+		return -1;
+
 	for (uint i = 0; i < _items[idx]->statics.size(); i++) {
 		if (_items[idx]->statics[i]->_staticsId == id)
 			return i;
@@ -1890,6 +1893,18 @@ int MGM::getStaticsIndexById(int idx, int16 id) {
 	return 0;
 }
 
+int MGM::getStaticsIndex(int idx, Statics *st) {
+	if (!_items[idx]->statics.size())
+		return -1;
+
+	for (uint i = 0; i < _items[idx]->statics.size(); i++) {
+		if (_items[idx]->statics[i] == st)
+			return i;
+	}
+
+	return 0;
+}
+
 void MGM::clearMovements2(int idx) {
 	_items[idx]->movements2.clear();
 }
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index cecde70..e87763f 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -173,6 +173,7 @@ public:
 	void updateAnimStatics(StaticANIObject *ani, int staticsId);
 	Common::Point *getPoint(Common::Point *point, int aniId, int staticsId1, int staticsId2);
 	int getStaticsIndexById(int idx, int16 id);
+	int getStaticsIndex(int idx, Statics *st);
 	void clearMovements2(int idx);
 	int recalcOffsets(int idx, int st1idx, int st2idx, bool flip, bool flop);
 	Common::Point *calcLength(Common::Point *point, Movement *mov, int x, int y, int *x1, int *y1, int flag);


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

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

Changed paths:
    engines/fullpipe/messages.cpp



diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index 4665712..3430897 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -392,7 +392,12 @@ void MessageQueue::addExCommandToEnd(ExCommand *ex) {
 }
 
 void MessageQueue::insertExCommandAt(int pos, ExCommand *ex) {
-	warning("STUB: MessageQueue::insertExCommandAt()");
+	Common::List<ExCommand *>::iterator it = _exCommands.begin();
+
+	for (int i = pos; i > 0; i--)
+		++it;
+
+	_exCommands.insert(it, ex);
 }
 
 ExCommand *MessageQueue::getExCommandByIndex(uint idx) {