[Scummvm-git-logs] scummvm master -> 5c2bfc4c236b7f899b3a9fddab20ec7845d29649

[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:
475ae058e3 FULLPIPE: Fix crash on reentering scene27.
5c2bfc4c23 FULLPIPE: Added debugging to interaction code


Commit: 475ae058e31579a6304c89ccc66cb0a07b6435c5
    https://github.com/scummvm/scummvm/commit/475ae058e31579a6304c89ccc66cb0a07b6435c5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-04T19:18:14+02:00

Commit Message:
FULLPIPE: Fix crash on reentering scene27.

The scene destructor will take care of the allocated bats.

Changed paths:
    engines/fullpipe/scenes/scene27.cpp



diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp
index 17bf391..a6ddbab 100644
--- a/engines/fullpipe/scenes/scene27.cpp
+++ b/engines/fullpipe/scenes/scene27.cpp
@@ -53,9 +53,6 @@ void scene27_initScene(Scene *sc) {
 	g_vars->scene27_maid = sc->getStaticANIObject1ById(ANI_MAID, -1);
 	g_vars->scene27_batHandler = sc->getStaticANIObject1ById(ANI_BITAHANDLER, -1);
 
-	for (uint i = 0; i < g_vars->scene27_balls.size(); i++)
-		delete g_vars->scene27_balls[i];
-
 	g_vars->scene27_balls.clear();
 	g_vars->scene27_bats.clear();
 	g_vars->scene27_var07.clear();


Commit: 5c2bfc4c236b7f899b3a9fddab20ec7845d29649
    https://github.com/scummvm/scummvm/commit/5c2bfc4c236b7f899b3a9fddab20ec7845d29649
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-04T19:48:12+02:00

Commit Message:
FULLPIPE: Added debugging to interaction code

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



diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index 39b4243..2250a5d 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -57,6 +57,7 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
 	DebugMan.addDebugChannel(kDebugEvents, "events", "Event handling");
 	DebugMan.addDebugChannel(kDebugInventory, "inventory", "Inventory");
 	DebugMan.addDebugChannel(kDebugSceneLogic, "scenelogic", "Scene Logic");
+	DebugMan.addDebugChannel(kDebugInteractions, "interactions", "Interactions");
 
 	// Setup mixer
 	if (!_mixer->isReady()) {
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 1b6e222..d8f438b 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -57,7 +57,8 @@ enum {
 	kDebugEvents		= 1 << 5,
 	kDebugBehavior		= 1 << 6,
 	kDebugInventory		= 1 << 7,
-	kDebugSceneLogic	= 1 << 8
+	kDebugSceneLogic	= 1 << 8,
+	kDebugInteractions	= 1 << 9
 };
 
 class BehaviorManager;
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
index accba78..ad7ce9f 100644
--- a/engines/fullpipe/interaction.cpp
+++ b/engines/fullpipe/interaction.cpp
@@ -128,6 +128,8 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject
 			if (cinter->_messageQueue)
 				cinter->_messageQueue->calcDuration(subj);
 
+			debugC(5, kDebugInteractions, "Interaction: %s", transCyrillic((byte *)cinter->_actionName));
+
 			PicAniInfo aniInfo;
 
 			obj->getPicAniInfo(&aniInfo);
diff --git a/engines/fullpipe/interaction.h b/engines/fullpipe/interaction.h
index cb1eac0..40df903 100644
--- a/engines/fullpipe/interaction.h
+++ b/engines/fullpipe/interaction.h
@@ -49,7 +49,7 @@ class Interaction : public CObject {
 	MessageQueue *_messageQueue;
 	int _sceneId;
 	int _field_28;
-	int _flags;
+	uint _flags;
 	char *_actionName;
 
  public: