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

[sev-]

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

Summary:
8bf202fe66 FULLPIPE: Fix crash in Movement destructor
b07a833b63 FULLPIPE: Fix mistypo in FullpipeEngine::stopAllSounds() which lead to crash
a59a4b8656 FULLPIPE: Fix indent
cbe41c94f7 FULLPIPE: Fix bug in Scene::getPictureObjectById()
de1df05b1f FULLPIPE: Fix bug in global_messageHandler3() which prevented mouse handling
a8effe2a6e FULLPIPE: Added more debug output


Commit: 8bf202fe66ab9f5cdbb0e5b6ec43ea6481dbf036
    https://github.com/scummvm/scummvm/commit/8bf202fe66ab9f5cdbb0e5b6ec43ea6481dbf036
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-14T11:32:55+02:00

Commit Message:
FULLPIPE: Fix crash in Movement destructor

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index d15da94..a796665 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1522,9 +1522,6 @@ Movement::~Movement() {
 		if (_updateFlag1)
 			_dynamicPhases.remove_at(0);
 
-		for (uint i = 0; i < _dynamicPhases.size(); i++)
-			delete _dynamicPhases[i];
-
 		_dynamicPhases.clear();
 	}
 


Commit: b07a833b639fa90c1306bcf1674f3f244ceba043
    https://github.com/scummvm/scummvm/commit/b07a833b639fa90c1306bcf1674f3f244ceba043
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-14T11:33:19+02:00

Commit Message:
FULLPIPE: Fix mistypo in FullpipeEngine::stopAllSounds() which lead to crash

Changed paths:
    engines/fullpipe/sound.cpp



diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp
index 3578e2a..ced5c75 100644
--- a/engines/fullpipe/sound.cpp
+++ b/engines/fullpipe/sound.cpp
@@ -301,7 +301,7 @@ void FullpipeEngine::stopAllSounds() {
 	// _mixer->stopAll();
 
 	for (int i = 0; i < _currSoundListCount; i++)
-		for (int j = 0; i < _currSoundList1[i]->getCount(); j++) {
+		for (int j = 0; j < _currSoundList1[i]->getCount(); j++) {
 			_currSoundList1[i]->getSoundByIndex(j)->stop();
 		}
 }


Commit: a59a4b86563609c5b1a52d98ce5bbc939bc094b8
    https://github.com/scummvm/scummvm/commit/a59a4b86563609c5b1a52d98ce5bbc939bc094b8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-14T12:11:58+02:00

Commit Message:
FULLPIPE: Fix indent

Changed paths:
    engines/fullpipe/fullpipe.cpp



diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 5397816..7881529 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -380,7 +380,7 @@ void FullpipeEngine::updateEvents() {
 		case Common::EVENT_QUIT:
 			_gameContinue = false;
 			break;
-			case Common::EVENT_RBUTTONDOWN:
+		case Common::EVENT_RBUTTONDOWN:
 			if (!_inputArFlag && (_updateTicks - _lastInputTicks) >= 2) {
 				ex = new ExCommand(0, 17, 107, event.mouse.x, event.mouse.y, 0, 1, 0, 0, 0);
 				ex->_excFlags |= 3;


Commit: cbe41c94f7cdeb76d40dbef4f5e293f32866d433
    https://github.com/scummvm/scummvm/commit/cbe41c94f7cdeb76d40dbef4f5e293f32866d433
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-14T12:12:44+02:00

Commit Message:
FULLPIPE: Fix bug in Scene::getPictureObjectById()

Changed paths:
    engines/fullpipe/scene.cpp



diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp
index 5dde566..2a78454 100644
--- a/engines/fullpipe/scene.cpp
+++ b/engines/fullpipe/scene.cpp
@@ -358,7 +358,7 @@ void Scene::stopAllSounds() {
 }
 
 PictureObject *Scene::getPictureObjectById(int objId, int flags) {
-	for (uint i = 0; i < _picObjList.size(); i++) {
+	for (uint i = 1; i < _picObjList.size(); i++) {
 		if (((PictureObject *)_picObjList[i])->_id == objId && ((PictureObject *)_picObjList[i])->_okeyCode == flags)
 			return (PictureObject *)_picObjList[i];
 	}


Commit: de1df05b1f47abe4c7091c14bbd4d46ef542c9bb
    https://github.com/scummvm/scummvm/commit/de1df05b1f47abe4c7091c14bbd4d46ef542c9bb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-14T12:15:37+02:00

Commit Message:
FULLPIPE: Fix bug in global_messageHandler3() which prevented mouse handling

Changed paths:
    engines/fullpipe/messagehandlers.cpp



diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp
index 15aa78d..d4f79d1 100644
--- a/engines/fullpipe/messagehandlers.cpp
+++ b/engines/fullpipe/messagehandlers.cpp
@@ -392,12 +392,10 @@ int global_messageHandler3(ExCommand *cmd) {
 			}
 			return result;
 		case 29:
-			if (!g_fp->_currentScene)
-				return result;
-
-			if (g_fp->_gameLoader->_interactionController->_flag24) {
+			if (g_fp->_gameLoader->_interactionController->_flag24 && g_fp->_currentScene) {
 				ani = g_fp->_currentScene->getStaticANIObjectAtPos(cmd->_sceneClickX, cmd->_sceneClickY);
 				ani2 = g_fp->_currentScene->getStaticANIObject1ById(g_fp->_gameLoader->_field_FA, -1);
+
 				if (ani) {
 					if (g_fp->_msgObjectId2 == ani->_id && g_fp->_msgId == ani->_okeyCode) {
 						cmd->_messageKind = 0;


Commit: a8effe2a6e0b08e4e4e5f2d0e36b58663a908cf7
    https://github.com/scummvm/scummvm/commit/a8effe2a6e0b08e4e4e5f2d0e36b58663a908cf7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-14T12:20:24+02:00

Commit Message:
FULLPIPE: Added more debug output

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 9fcb012..b9fdc43 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1500,6 +1500,8 @@ MessageQueue *MovGraph2::doWalkTo(StaticANIObject *obj, int xpos, int ypos, int
 	PicAniInfo picAniInfo;
 	Common::Point point;
 
+	debug(0, "MovGraph2::doWalkTo(%d, %d, %d, %d, %d)", obj->_id, xpos, ypos, fuzzyMatch, staticsId);
+
 	int idx = getItemIndexByGameObjectId(obj->_id);
 
 	if (idx < 0)
@@ -3127,11 +3129,11 @@ bool MovGraphReact::pointInRegion(int x, int y) {
 	}
 }
 
-int startWalkTo(int objId, int objKey, int x, int y, int a5) {
-	MctlCompound *mc = getSc2MctlCompoundBySceneId(g_fp->_currentScene->_sceneId);
+int startWalkTo(int objId, int objKey, int x, int y, int fuzzyMatch) {
+	MctlCompound *mc = getCurrSceneSc2MotionController();
 
 	if (mc)
-		return (mc->method34(g_fp->_currentScene->getStaticANIObject1ById(objId, objKey), x, y, a5, 0) != 0);
+		return (mc->method34(g_fp->_currentScene->getStaticANIObject1ById(objId, objKey), x, y, fuzzyMatch, 0) != 0);
 
 	return 0;
 }