[Scummvm-cvs-logs] scummvm master -> 18bbf4a2eb6e972175c5b503ce3e7728c3059ace

sev- sev at scummvm.org
Mon Sep 9 20:33:38 CEST 2013


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

Summary:
6ca4b7d514 FULLPIPE: Fix logical error. CID 1086778
a6231b83d1 FULLPIPE: Remove unnecessary check. CID 1086775
33f975a446 FULLPIPE: Do not continue unnecessary function. CID 1086777
18bbf4a2eb FULLPIPE: Fix logical error. CID 1086776


Commit: 6ca4b7d5146d282ff3d41efa70f92cfe877beafc
    https://github.com/scummvm/scummvm/commit/6ca4b7d5146d282ff3d41efa70f92cfe877beafc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-09T11:04:42-07:00

Commit Message:
FULLPIPE: Fix logical error. CID 1086778

Changed paths:
    engines/fullpipe/interaction.cpp



diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index cdf39d2..270f5b5 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -424,7 +424,7 @@ bool CInteraction::canInteract(GameObject *obj1, GameObject *obj2, int invId) {
 		return false;
 
 	if ((_flags & 8) && (_flags & 1)) {
-		if (!obj2->_objtype != kObjTypeStaticANIObject)
+		if (obj2->_objtype != kObjTypeStaticANIObject)
 			return false;
 
 		StaticANIObject *st = (StaticANIObject *)obj2;


Commit: a6231b83d186897c3a4c5b759e9f81572b815e9f
    https://github.com/scummvm/scummvm/commit/a6231b83d186897c3a4c5b759e9f81572b815e9f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-09T11:08:06-07:00

Commit Message:
FULLPIPE: Remove unnecessary check. CID 1086775

Changed paths:
    engines/fullpipe/interaction.cpp



diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index 270f5b5..0b47dad 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -195,8 +195,7 @@ LABEL_38:
 					mq = new MessageQueue(inter->_messageQueue, 0, 1);
 
 					if (!mq->chain(subj)) {
-						if (mq)
-							delete mq;
+						delete mq;
 
 						return false;
 					}


Commit: 33f975a446325d37947c5634b83a26cbb622db5f
    https://github.com/scummvm/scummvm/commit/33f975a446325d37947c5634b83a26cbb622db5f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-09T11:15:47-07:00

Commit Message:
FULLPIPE: Do not continue unnecessary function. CID 1086777

Changed paths:
    engines/fullpipe/interaction.cpp



diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index 0b47dad..91dc896 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -77,6 +77,9 @@ bool CInteractionController::handleInteraction(StaticANIObject *subj, GameObject
 	if (subj) {
 		if (!subj->isIdle() || (subj->_flags & 0x100))
 			return false;
+	} else {
+		error("CInteractionController::handleInteraction(): subj is null");
+		return false;
 	}
 
 	if (!_interactions.size())


Commit: 18bbf4a2eb6e972175c5b503ce3e7728c3059ace
    https://github.com/scummvm/scummvm/commit/18bbf4a2eb6e972175c5b503ce3e7728c3059ace
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-09T11:21:39-07:00

Commit Message:
FULLPIPE: Fix logical error. CID 1086776

Changed paths:
    engines/fullpipe/scenes.cpp



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 0c06e03..f4e771a 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -979,7 +979,7 @@ int global_messageHandler3(ExCommand *cmd) {
 							cmd->_messageKind = 0;
 							return result;
 						}
-						if (ani2->canInteractAny(pic, cmd->_keyCode)) {
+						if (!ani2 || ani2->canInteractAny(pic, cmd->_keyCode)) {
 							if (!ani2 || (ani2->isIdle() && !(ani2->_flags & 0x80) && !(ani2->_flags & 0x100)))
 								handleObjectInteraction(ani2, pic, cmd->_keyCode);
 							return 1;






More information about the Scummvm-git-logs mailing list