[Scummvm-git-logs] scummvm master -> bbdae9120e661a36254c5c6f171e89c973d58bc8

[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:
641920ee44 FULLPIPE: Added debug inventory to scene05
e49728fc1f FULLPIPE: Added more debug output to scene05
bbdae9120e FULLPIPE: Properly initialize ObjstateCommand. This fixes game logic transitions


Commit: 641920ee4422525864d2bcf7a0caa60739a0be43
    https://github.com/scummvm/scummvm/commit/641920ee4422525864d2bcf7a0caa60739a0be43
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-04T21:20:29+02:00

Commit Message:
FULLPIPE: Added debug inventory to scene05

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



diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/fullpipe/scenes/scene05.cpp
index b2efd29..f3c94d1 100644
--- a/engines/fullpipe/scenes/scene05.cpp
+++ b/engines/fullpipe/scenes/scene05.cpp
@@ -22,6 +22,7 @@
 
 #include "fullpipe/fullpipe.h"
 
+#include "fullpipe/gameloader.h"
 #include "fullpipe/objects.h"
 #include "fullpipe/objectnames.h"
 #include "fullpipe/constants.h"
@@ -36,6 +37,13 @@
 namespace Fullpipe {
 
 void scene05_initScene(Scene *sc) {
+
+#if 0
+	Inventory2 *inv = getGameLoaderInventory();
+	inv->addItem(ANI_INV_BOX, 1);
+	inv->rebuildItemRects();
+#endif
+
 	g_vars->scene05_handle = sc->getStaticANIObject1ById(ANI_HANDLE, -1);
 	g_vars->scene05_wacko = sc->getStaticANIObject1ById(ANI_OTMOROZ, -1);
 	g_vars->scene05_bigHatch = sc->getStaticANIObject1ById(ANI_BIGLUK, -1);


Commit: e49728fc1fd100162ca0d9fa02a9a86bb5705c59
    https://github.com/scummvm/scummvm/commit/e49728fc1fd100162ca0d9fa02a9a86bb5705c59
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-04T21:20:29+02:00

Commit Message:
FULLPIPE: Added more debug output to scene05

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



diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/fullpipe/scenes/scene05.cpp
index f3c94d1..0135c94 100644
--- a/engines/fullpipe/scenes/scene05.cpp
+++ b/engines/fullpipe/scenes/scene05.cpp
@@ -37,6 +37,7 @@
 namespace Fullpipe {
 
 void scene05_initScene(Scene *sc) {
+	debugC(1, kDebugSceneLogic, "scene05_initScene()");
 
 #if 0
 	Inventory2 *inv = getGameLoaderInventory();
@@ -57,24 +58,32 @@ void scene05_initScene(Scene *sc) {
 
 	g_fp->_currentScene = sc;
 
+	debugC(2, kDebugSceneLogic, "scene05: Weird Wacko state: %d", g_fp->getObjectState(sO_WeirdWacko));
+
 	if (g_fp->getObjectState(sO_WeirdWacko) == g_fp->getObjectEnumState(sO_WeirdWacko, sO_InGlasses)) {
+		debugC(2, kDebugSceneLogic, "scene05: In glasses");
 		g_vars->scene05_wacko->changeStatics2(ST_OTM_GLS_LEFT);
 		g_vars->scene05_bigHatch->changeStatics2(ST_BLK_CLOSED);
 
 		g_vars->scene05_handle->changeStatics2(ST_HDL_UP);
 		g_vars->scene05_handle->_flags |= 4;
 	} else if (g_fp->getObjectState(sO_WeirdWacko) == g_fp->getObjectEnumState(sO_WeirdWacko, sO_WithDrawer)) {
+		debugC(2, kDebugSceneLogic, "scene05: With Drawer");
 		g_vars->scene05_wacko->changeStatics2(ST_OTM_BOX_LEFT);
 		g_vars->scene05_bigHatch->changeStatics2(ST_BLK_CLOSED);
 		g_vars->scene05_handle->changeStatics2(ST_HDL_UP);
 		g_vars->scene05_handle->_flags |= 4;
 	} else {
-		g_vars->scene05_wacko->changeStatics2(ST_OTM_VNT_LEFT);
-
 		if (g_fp->getObjectState(sO_WeirdWacko) != g_fp->getObjectEnumState(sO_WeirdWacko, sO_WithPlunger)) {
+			debugC(2, kDebugSceneLogic, "scene05: Without plunger");
+
 			g_vars->scene05_handle->changeStatics2(ST_HDL_BROKEN);
 			g_vars->scene05_bigHatch->changeStatics2(ST_BLK_CLOSED);
+		} else {
+			debugC(2, kDebugSceneLogic, "scene05: With plunger");
 		}
+
+		g_vars->scene05_wacko->changeStatics2(ST_OTM_VNT_LEFT);
 	}
 
 	g_fp->_currentScene = oldscene;


Commit: bbdae9120e661a36254c5c6f171e89c973d58bc8
    https://github.com/scummvm/scummvm/commit/bbdae9120e661a36254c5c6f171e89c973d58bc8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-04T21:20:29+02:00

Commit Message:
FULLPIPE: Properly initialize ObjstateCommand. This fixes game logic transitions

Changed paths:
    engines/fullpipe/messages.cpp



diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index 147a35c..e9b2c40 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -233,11 +233,13 @@ Message::Message(int16 parentId, int messageKind, int x, int y, int a6, int a7,
 ObjstateCommand::ObjstateCommand() {
 	_value = 0;
 	_objCommandName = 0;
+	_objtype = kObjTypeObjstateCommand;
 }
 
 ObjstateCommand::ObjstateCommand(ObjstateCommand *src) : ExCommand(src) {
 	_value = src->_value;
 	_objCommandName = (char *)calloc(strlen(src->_objCommandName) + 1, 1);
+	_objtype = kObjTypeObjstateCommand;
 
 	strncpy(_objCommandName, src->_objCommandName, strlen(src->_objCommandName));
 }