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

sev- sev at scummvm.org
Thu Sep 22 18:19:36 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:
19780a8e05 FULLPIPE: Added more debug output to scene04
b32f167345 FULLPIPE: Fix Kozyawkas not hanging in the air when jar is lifter in scene04


Commit: 19780a8e0544c4c81b4cd04ae59f2366ec647da0
    https://github.com/scummvm/scummvm/commit/19780a8e0544c4c81b4cd04ae59f2366ec647da0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-22T18:18:59+02:00

Commit Message:
FULLPIPE: Added more 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 3bdc338..a093eab 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -67,7 +67,7 @@ void scene04_springCallback(int *phase) {
 void scene04_initScene(Scene *sc) {
 	debugC(1, kDebugSceneLogic, "scene04_initScene()");
 
-#if 0
+#if 1
 	Inventory2 *inv = getGameLoaderInventory();
 	inv->addItem(ANI_INV_COIN, 1);
 	inv->rebuildItemRects();
@@ -573,6 +573,8 @@ MessageQueue *sceneHandler04_kozFly3(StaticANIObject *ani, double phase) {
 	AniHandler aniHandler;
 	MakeQueueStruct mkQueue;
 
+	debugC(2, kDebugSceneLogic, "scene04: kozFly3 (OK)");
+
 	aniHandler.attachObject(ANI_KOZAWKA);
 
 	mkQueue.ani = ani;
@@ -622,6 +624,8 @@ MessageQueue *sceneHandler04_kozFly5(StaticANIObject *ani, double phase) {
 	AniHandler aniHandler;
 	MakeQueueStruct mkQueue;
 
+	debugC(2, kDebugSceneLogic, "scene04: kozFly5 (OK)");
+
 	aniHandler.attachObject(ANI_KOZAWKA);
 
 	mkQueue.ani = ani;
@@ -693,6 +697,8 @@ MessageQueue *sceneHandler04_kozFly6(StaticANIObject *ani) {
 	AniHandler aniHandler;
 	MakeQueueStruct mkQueue;
 
+	debugC(2, kDebugSceneLogic, "scene04: kozFly6 (OK)");
+
 	aniHandler.attachObject(ANI_KOZAWKA);
 
 	mkQueue.ani = ani;
@@ -751,6 +757,8 @@ MessageQueue *sceneHandler04_kozFly7(StaticANIObject *ani, double phase) {
 	AniHandler aniHandler;
 	MakeQueueStruct mkQueue;
 
+	debugC(2, kDebugSceneLogic, "scene04: kozFly7");
+
 	aniHandler.attachObject(ANI_KOZAWKA);
 
 	mkQueue.ani = ani;
@@ -870,7 +878,7 @@ void sceneHandler04_shootKozyawka() {
 						else
 							mq = sceneHandler04_kozFly7(g_vars->scene04_walkingKozyawka, (double)(phase - 6) * 0.3333333333333333);
 					} else {
-						mq = sceneHandler04_kozFly5(g_vars->scene04_walkingKozyawka, (double)(phase - 2) * 0.3333333333333333);
+						mq = sceneHandler04_kozFly7(g_vars->scene04_walkingKozyawka, (double)(phase - 2) * 0.3333333333333333);
 					}
 				} else {
 					mq = sceneHandler04_kozFly3(g_vars->scene04_walkingKozyawka, (double)phase * 0.5);
@@ -1179,6 +1187,8 @@ void sceneHandler04_handTake() {
 }
 
 void sceneHandler04_putKozyawkaBack(StaticANIObject *ani) {
+	debugC(2, kDebugSceneLogic, "scene04: putKozyawkaBack");
+
 	g_vars->scene04_bottleObjList.push_back(ani);
 	g_vars->scene04_kozyawkiAni.push_back(ani);
 


Commit: b32f167345de9cdf30d1d229aca75f13df918e5b
    https://github.com/scummvm/scummvm/commit/b32f167345de9cdf30d1d229aca75f13df918e5b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-22T18:18:59+02:00

Commit Message:
FULLPIPE: Fix Kozyawkas not hanging in the air when jar is lifter in scene04

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



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index a093eab..445451e 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -951,9 +951,15 @@ void sceneHandler04_walkKozyawka() {
 
 void sceneHandler04_bottleUpdateObjects(int off) {
 	for (Common::List<GameObject *>::iterator it = g_vars->scene04_bottleObjList.begin(); it != g_vars->scene04_bottleObjList.end(); ++it) {
-		GameObject *obj = *it;
+		if ((*it)->_objtype == kObjTypeStaticANIObject) {
+			StaticANIObject *st = (StaticANIObject *)*it;
 
-		obj->setOXY(obj->_ox, off + obj->_oy);
+			st->setOXY(st->_ox, off + st->_oy);
+		} else {
+			GameObject *obj = *it;
+
+			obj->setOXY(obj->_ox, off + obj->_oy);
+		}
 	}
 }
 





More information about the Scummvm-git-logs mailing list