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

sev- sev at scummvm.org
Sun Sep 4 22:27:28 CEST 2016


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:
8cc0583c74 FULLPIPE: Fix drawAlphaRectangle()
a3238fdbac FULLPIPE: Added debug output to scene04


Commit: 8cc0583c747b47a7b5ff1354c4d84e83887177f5
    https://github.com/scummvm/scummvm/commit/8cc0583c747b47a7b5ff1354c4d84e83887177f5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-04T22:19:13+02:00

Commit Message:
FULLPIPE: Fix drawAlphaRectangle()

Changed paths:
    engines/fullpipe/gfx.cpp



diff --git a/engines/fullpipe/gfx.cpp b/engines/fullpipe/gfx.cpp
index 6d0edf7..2e941c9 100644
--- a/engines/fullpipe/gfx.cpp
+++ b/engines/fullpipe/gfx.cpp
@@ -1266,7 +1266,7 @@ DynamicPhase *Shadows::findSize(int width, int height) {
 
 void FullpipeEngine::drawAlphaRectangle(int x1, int y1, int x2, int y2, int alpha) {
 	for (int y = y1; y < y2; y++) {
-		uint32 *ptr = (uint32 *)g_fp->_backgroundSurface.getBasePtr(0, y);
+		uint32 *ptr = (uint32 *)g_fp->_backgroundSurface.getBasePtr(x1, y);
 
 		for (int x = x1; x < x2; x++) {
 			uint32 color = *ptr;


Commit: a3238fdbac5c2b3c0cd5b7e753321c3973fe8a3b
    https://github.com/scummvm/scummvm/commit/a3238fdbac5c2b3c0cd5b7e753321c3973fe8a3b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-04T22:27:05+02:00

Commit Message:
FULLPIPE: Added debug output to scene04

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



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 7351c33..cb590f1 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -65,6 +65,14 @@ void scene04_springCallback(int *phase) {
 }
 
 void scene04_initScene(Scene *sc) {
+	debugC(1, kDebugSceneLogic, "scene04_initScene()");
+
+#if 0
+	Inventory2 *inv = getGameLoaderInventory();
+	inv->addItem(ANI_INV_COIN, 1);
+	inv->rebuildItemRects();
+#endif
+
 	g_vars->scene04_dudeOnLadder = false;
 	g_vars->scene04_bottle = sc->getPictureObjectById(PIC_SC4_BOTTLE, 0);
 	g_vars->scene04_hand = sc->getStaticANIObject1ById(ANI_HAND, -1);
@@ -118,6 +126,8 @@ void scene04_initScene(Scene *sc) {
 		plank->_flags |= 8;
 
 	if (g_fp->getObjectState(sO_Jar_4) == g_fp->getObjectEnumState(sO_Jar_4, sO_UpsideDown)) {
+		debugC(2, kDebugSceneLogic, "scene04: Jar is upside down");
+
 		g_vars->scene04_bottleObjList.clear();
 		g_vars->scene04_kozyawkiObjList.clear();
 
@@ -128,6 +138,8 @@ void scene04_initScene(Scene *sc) {
 		g_vars->scene04_clockCanGo = false;
 		g_vars->scene04_objectIsTaken = false;
 	} else {
+		debugC(2, kDebugSceneLogic, "scene04: Jar is NOT upside down");
+
 		StaticANIObject *spring = sc->getStaticANIObject1ById(ANI_SPRING, -1);
 
 		if (spring)
@@ -140,6 +152,8 @@ void scene04_initScene(Scene *sc) {
 		g_vars->scene04_kozyawkiObjList.clear();
 
 		if (koz) {
+			debugC(2, kDebugSceneLogic, "scene04: We're in koz");
+
 			koz->loadMovementsPixelData();
 
 			koz->_statics = koz->getStaticsById(ST_KZW_EMPTY);
@@ -162,6 +176,8 @@ void scene04_initScene(Scene *sc) {
 
 		g_vars->scene04_clockCanGo = true;
 		g_vars->scene04_objectIsTaken = true;
+
+		debugC(2, kDebugSceneLogic, "scene04: kozObjList size: %d", g_vars->scene04_kozyawkiObjList.size());
 	}
 
 	g_vars->scene04_bottleIsTaken = false;
@@ -911,7 +927,11 @@ void sceneHandler04_animOutOfBottle(ExCommand *ex) {
 }
 
 void sceneHandler04_walkKozyawka() {
+	debugC(1, kDebugSceneLogic, "scene04: walkKozyawka");
+
 	if (g_vars->scene04_kozyawkiObjList.size()) {
+		debugC(1, kDebugSceneLogic, "scene04: walkKozyawka: getting one");
+
 		g_vars->scene04_walkingKozyawka = g_vars->scene04_kozyawkiObjList.front();
 		g_vars->scene04_kozyawkiObjList.pop_front();
 
@@ -1338,6 +1358,8 @@ int sceneHandler04(ExCommand *ex) {
 		break;
 
 	case MSG_KOZAWRESTART:
+		debugC(1, kDebugSceneLogic, "scene04: kozawRestart");
+
 		if (g_vars->scene04_walkingKozyawka) {
 			g_vars->scene04_kozyawkiObjList.push_back(g_vars->scene04_walkingKozyawka);
 			g_vars->scene04_walkingKozyawka->hide();





More information about the Scummvm-git-logs mailing list