[Scummvm-git-logs] scummvm master -> 4a07489af2fc7cbab8358712c2c0d50b42efc4a9

[sev-]

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

Summary:
fb66de5bb9 FULLPIPE: Fix Movement::calcDuration
edf9828a11 FULLPIPE: Fix MessageQueue instantination in MctlGraph::makeQueue
4a07489af2 FULLPIPE: Fix invalid motion when turning


Commit: fb66de5bb97baedb9f4780a680c2da0b03d529d7
    https://github.com/scummvm/scummvm/commit/fb66de5bb97baedb9f4780a680c2da0b03d529d7
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-09-24T17:32:20+02:00

Commit Message:
FULLPIPE: Fix Movement::calcDuration

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 79432d4..404a8ed 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1893,11 +1893,11 @@ int Movement::calcDuration() {
 
 	if (_currMovement)
 		for (uint i = 0; i < _currMovement->_dynamicPhases.size(); i++) {
-			res += _currMovement->_dynamicPhases[i]->_initialCountdown;
+			res += _currMovement->_dynamicPhases[i]->_initialCountdown + 1;
 		}
 	else
 		for (uint i = 0; i < _dynamicPhases.size(); i++) {
-			res += _dynamicPhases[i]->_initialCountdown;
+			res += _dynamicPhases[i]->_initialCountdown + 1;
 		}
 
 	return res;


Commit: edf9828a1106d55cfc694d36c6d21f1e13c918c9
    https://github.com/scummvm/scummvm/commit/edf9828a1106d55cfc694d36c6d21f1e13c918c9
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-09-24T17:33:18+02:00

Commit Message:
FULLPIPE: Fix MessageQueue instantination in MctlGraph::makeQueue

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index ba627a9..4d9218c 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -2225,9 +2225,7 @@ MessageQueue *MctlGraph::makeQueue(StaticANIObject *obj, int xpos, int ypos, int
 	}
 
 	if (obj->_ox == xpos && obj->_oy == ypos) {
-		g_fp->_globalMessageQueueList->compact();
-
-		MessageQueue *mq = new MessageQueue();
+		MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact());
 
 		if (staticsId && obj->_statics->_staticsId != staticsId) {
 			int idxwalk = getDirByStatics(idx, staticsId);


Commit: 4a07489af2fc7cbab8358712c2c0d50b42efc4a9
    https://github.com/scummvm/scummvm/commit/4a07489af2fc7cbab8358712c2c0d50b42efc4a9
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-09-24T17:33:34+02:00

Commit Message:
FULLPIPE: Fix invalid motion when turning

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 4d9218c..51f5ae7 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -2237,7 +2237,7 @@ MessageQueue *MctlGraph::makeQueue(StaticANIObject *obj, int xpos, int ypos, int
 				return 0;
 			}
 
-			ExCommand *ex = new ExCommand(picAniInfo.objectId, 1, _items2[idx]->_subItems[idxsub]._walk[idxwalk]._movementId, 0, 0, 0, 1, 0, 0, 0);
+			ExCommand *ex = new ExCommand(picAniInfo.objectId, 1, _items2[idx]->_subItems[idxsub]._turnS[idxwalk]._movementId, 0, 0, 0, 1, 0, 0, 0);
 
 			ex->_field_24 = 1;
 			ex->_param = picAniInfo.field_8;