[Scummvm-cvs-logs] scummvm master -> b3b27c3d0eeb454d43f27afcdb609ada3498fc17

sev- sev at scummvm.org
Mon Mar 24 23:29:39 CET 2014


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:
7ef1806938 FULLPIPE: More work on scene29_initScene()
78e5849268 FULLPIPE: Finish scene29_initScene() implementation
202804d8d3 FULLPIPE: Implement scene29_updateCursor()
b3b27c3d0e FULLPIPE: Enable scene29


Commit: 7ef1806938e7995de0a0115945d4f6856950ef25
    https://github.com/scummvm/scummvm/commit/7ef1806938e7995de0a0115945d4f6856950ef25
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-25T00:28:52+02:00

Commit Message:
FULLPIPE: More work on scene29_initScene()

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



diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index dabc487..9efb428 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -36,6 +36,12 @@
 
 namespace Fullpipe {
 
+struct WalkingBearder {
+	StaticANIObject *ani;
+	int wbflag;
+	int wbcounter;
+};
+
 void scene29_initScene(Scene *sc) {
 	g_vars->scene29_var01 = 300;
 	g_vars->scene29_var02 = 200;
@@ -46,26 +52,13 @@ void scene29_initScene(Scene *sc) {
 	g_vars->scene29_shooter2 = sc->getStaticANIObject1ById(ANI_SHOOTER2, -1);
 	g_vars->scene29_ass = sc->getStaticANIObject1ById(ANI_ASS, -1);
 
-	v2 = g_vars->scene29_var05.pHead;
-	if (g_vars->scene29_var05.pHead) {
-		do
-			v2 = v2->p0;
-		while ( v2 );
-	}
-
 	g_vars->scene29_var05.numBalls = 0;
 	g_vars->scene29_var05.pTail = 0;
 	g_vars->scene29_var05.field_8 = 0;
 	g_vars->scene29_var05.pHead = 0;
-	CPlex::FreeDataChain(g_vars->scene29_var05.cPlex);
-	v3 = g_vars->scene29_var08.pHead;
-	g_vars->scene29_var05.cPlex = 0;
 
-	if (g_vars->scene29_var08.pHead) {
-		do
-			v3 = v3->p0;
-		while (v3);
-	}
+	free(g_vars->scene29_var05.cPlex);
+	g_vars->scene29_var05.cPlex = 0;
 
 	StaticANIObject *ani;
 
@@ -73,87 +66,82 @@ void scene29_initScene(Scene *sc) {
 	g_vars->scene29_var08.pTail = 0;
 	g_vars->scene29_var08.field_8 = 0;
 	g_vars->scene29_var08.pHead = 0;
-	CPlex::FreeDataChain(g_vars->scene29_var08.cPlex);
+
+	free(g_vars->scene29_var08.cPlex);
 	g_vars->scene29_var08.cPlex = 0;
 
 	ani = sc->getStaticANIObject1ById(ANI_SHELL_GREEN, -1);
-	v5 = g_vars->scene29_var05->sub04(g_vars->scene29_var05.field_8, 0);
-	v5->ani = ani;
+	Ball *b = g_vars->scene29_var05->sub04(g_vars->scene29_var05.field_8, 0);
+	b->ani = ani;
 
 	if (g_vars->scene29_var05.field_8)
-		g_vars->scene29_var05.field_8->p0 = v5;
+		g_vars->scene29_var05.field_8->p0 = b;
 	else
-		g_vars->scene29_var05.pHead = v5;
-	g_vars->scene29_var05.field_8 = v5;
+		g_vars->scene29_var05.pHead = b;
+
+	g_vars->scene29_var05.field_8 = b;
 
 	for (int i = 0; i < 2; i++) {
-		ani = new StaticANIObject(ani);
+		StaticANIObject *newani = new StaticANIObject(ani);
 
-		sc->addStaticANIObject(ani, 1);
-		v8 = g_vars->scene29_var05->sub04(g_vars->scene29_var05.field_8, 0);
-		v8->ani = ani;
+		sc->addStaticANIObject(newani, 1);
+
+		b = g_vars->scene29_var05->sub04(g_vars->scene29_var05.field_8, 0);
+		b->ani = ani;
 
 		if (g_vars->scene29_var05.field_8)
-			g_vars->scene29_var05.field_8->p0 = v8;
+			g_vars->scene29_var05.field_8->p0 = b;
 		else
-			g_vars->scene29_var05.pHead = v8;
-		g_vars->scene29_var05.field_8 = v8;
-	}
+			g_vars->scene29_var05.pHead = b;
 
-	v9 = g_vars->scene29_var06.pHead;
-	if (g_vars->scene29_var06.pHead) {
-		do
-			v9 = v9->p0;
-		while (v9);
+		g_vars->scene29_var05.field_8 = b;
 	}
 
 	g_vars->scene29_var06.numBalls = 0;
 	g_vars->scene29_var06.pTail = 0;
 	g_vars->scene29_var06.field_8 = 0;
 	g_vars->scene29_var06.pHead = 0;
-	CPlex::FreeDataChain(g_vars->scene29_var06.cPlex);
-	v10 = g_vars->scene29_var07.pHead;
-	g_vars->scene29_var06.cPlex = 0;
 
-	if (g_vars->scene29_var07.pHead) {
-		do
-			v10 = v10->p0;
-		while (v10);
-	}
+	free(g_vars->scene29_var06.cPlex);
+	g_vars->scene29_var06.cPlex = 0;
 
 	g_vars->scene29_var07.numBalls = 0;
 	g_vars->scene29_var07.pTail = 0;
 	g_vars->scene29_var07.field_8 = 0;
 	g_vars->scene29_var07.pHead = 0;
-	CPlex::FreeDataChain(g_vars->scene29_var07.cPlex);
+
+	free(g_vars->scene29_var07.cPlex);
 	g_vars->scene29_var07.cPlex = 0;
 
 	ani = sc->getStaticANIObject1ById(ANI_SHELL_RED, -1);
-	v12 = g_vars->scene29_var06->sub04(g_vars->scene29_var06.field_8, 0);
-	v12->ani = ani;
+
+	b = g_vars->scene29_var06->sub04(g_vars->scene29_var06.field_8, 0);
+	b->ani = ani;
 
 	if (g_vars->scene29_var06.field_8)
-		g_vars->scene29_var06.field_8->p0 = v12;
+		g_vars->scene29_var06.field_8->p0 = b;
 	else
-		g_vars->scene29_var06.pHead = v12;
+		g_vars->scene29_var06.pHead = b;
 
-	g_vars->scene29_var06.field_8 = v12;
+	g_vars->scene29_var06.field_8 = b;
 
 	for (int i = 0; i < 2; i++) {
-		ani = new StaticANIObject(ani);
-		ac->addStaticANIObject(sc, ani, 1);
-		v15 = g_vars->scene29_var06->sub04(g_vars->scene29_var06.field_8, 0);
-		v15->ani = ani;
+		StaticANIObject *newani = new StaticANIObject(ani);
+
+		sc->addStaticANIObject(newani, 1);
+
+		b = g_vars->scene29_var06->sub04(g_vars->scene29_var06.field_8, 0);
+		b->ani = ani;
 
 		if (g_vars->scene29_var06.field_8)
-			g_vars->scene29_var06.field_8->p0 = v15;
+			g_vars->scene29_var06.field_8->p0 = b;
 		else
-			g_vars->scene29_var06.pHead = v15;
+			g_vars->scene29_var06.pHead = b;
 
-		g_vars->scene29_var06.field_8 = v15;
+		g_vars->scene29_var06.field_8 = b;
 	}
 
-	ObArray_SetSize_0x0C((ObArray *)&g_vars->scene29_var19, 0, -1);
+	g_vars->scene29_var19.clear();
 
 	ani = new StaticANIObject(accessScene(SC_COMMON)->getStaticANIObject1ById(ANI_BEARDED_CMN, -1));
 
@@ -161,12 +149,13 @@ void scene29_initScene(Scene *sc) {
 
 	sc->addStaticANIObject(ani, 1);
 
-	v20 = g_vars->scene29_var19.m_nSize;
-	ObArray_SetSize_0x0C((ObArray *)&g_vars->scene29_var19, g_vars->scene29_var19.m_nSize + 1, -1);
-	v21 = &g_vars->scene29_var19.m_pData[v20];
-	v21->ani = v19;
-	v21->wbflag = 0;
-	v21->wbcounter = 0;
+	WalkingBearder *wb = new WalkingBearder;
+
+	wb->ani = ani;
+	wb->wbflag = 0;
+	wb->wbcounter = 0;
+
+	g_vars->scene29_var19.push_back(wb);
 
 	g_vars->scene29_var09 = 0;
 	g_vars->scene29_var10 = 0;
@@ -369,14 +358,11 @@ int sceneHandler29(ExCommand *cmd) {
 
 	case 33:
 		if (g_vars->scene29_var10) {
-			v5 = g_vars->scene29_var20;
-			if (g_vars->scene29_var20 > g_fp->_sceneRect.right - 500) {
+			if (g_vars->scene29_var20 > g_fp->_sceneRect.right - 500)
 				g_fp->_currentScene->_x = g_fp->_sceneRect.right - g_vars->scene29_var20 - 350;
-				v5 = g_vars->scene29_var20;
-			}
 
-			if (v5 < g_sceneRect.left + 100)
-				g_fp->_currentScene->_x = v5 - g_fp->_sceneRect.left - 100;
+			if (g_vars->scene29_var20 < g_sceneRect.left + 100)
+				g_fp->_currentScene->_x = g_vars->scene29_var20 - g_fp->_sceneRect.left - 100;
 
 		} else if (g_fp->_aniMan2) {
 			int x = g_fp->_aniMan2->_ox;


Commit: 78e58492682c6665c850b6ff427f41cc2fb6b665
    https://github.com/scummvm/scummvm/commit/78e58492682c6665c850b6ff427f41cc2fb6b665
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-25T00:28:52+02:00

Commit Message:
FULLPIPE: Finish scene29_initScene() implementation

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/module.mk
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes.h
    engines/fullpipe/scenes/scene29.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 9062fe9..7924b33 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1276,6 +1276,37 @@ namespace Fullpipe {
 #define QU_SC28_WMN_START 3452
 #define ST_MAN28_RIGHT 4249
 
+// Scene 29
+#define ANI_ASS 2120
+#define ANI_PORTER 2082
+#define ANI_SHELL_GREEN 2116
+#define ANI_SHELL_RED 2130
+#define ANI_SHOOTER1 2108
+#define ANI_SHOOTER2 2111
+#define MSG_SC29_DISABLEPORTER 2097
+#define MSG_SC29_DISABLERIDEBACK 2106
+#define MSG_SC29_ENABLEPORTER 2096
+#define MSG_SC29_ENABLERIDEBACK 2105
+#define MSG_SC29_LAUGH 4760
+#define MSG_SC29_SHOOTGREEN 2119
+#define MSG_SC29_SHOOTRED 2137
+#define MSG_SC29_SHOWLASTGREEN 2730
+#define MSG_SC29_SHOWLASTRED 2731
+#define MSG_SC29_STOPRIDE 2107
+#define MV_ASS_HITGREEN 2138
+#define MV_ASS_HITRED 2139
+#define MV_MAN29_BEND 2091
+#define MV_MAN29_JUMP 2090
+#define MV_MAN29_RUN 2095
+#define MV_MAN29_STANDUP 2092
+#define MV_PTR_MOVEFAST 2102
+#define MV_SHG_HITASS 2151
+#define MV_SHR_HITASS 2152
+#define SND_29_028 4758
+#define SND_29_029 4759
+#define ST_ASS_NORM 2122
+#define ST_MAN29_RUNR 2140
+
 // Scene 30
 #define ANI_LEG 2322
 #define MSG_SC30_UPDATEPATH 2358
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index db97fa2..3962fe6 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -52,6 +52,7 @@ MODULE_OBJS = \
 	scenes/scene26.o \
 	scenes/scene27.o \
 	scenes/scene28.o \
+	scenes/scene29.o \
 	scenes/scene30.o \
 	scenes/scene31.o \
 	scenes/scene32.o \
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 147961b..4746cb2 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -378,6 +378,27 @@ Vars::Vars() {
 	scene28_headBeardedFlipper = false;
 	scene28_lift6inside = false;
 
+	scene29_var01 = 0;
+	scene29_var02 = 0;
+	scene29_var03 = 0;
+	scene29_var04 = 0;
+	scene29_porter = 0;
+	scene29_shooter1 = 0;
+	scene29_shooter2 = 0;
+	scene29_ass = 0;
+	scene29_var09 = 0;
+	scene29_var10 = 0;
+	scene29_var11 = 0;
+	scene29_var12 = 0;
+	scene29_var13 = 0;
+	scene29_var14 = 75;
+	scene29_var15 = 0;
+	scene29_var16 = 0;
+	scene29_var17 = 0;
+	scene29_var18 = 0;
+	scene29_var20 = 0;
+	scene29_var21 = 0;
+
 	scene30_leg = 0;
 	scene30_liftFlag = 1;
 
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index f99e76d..04d84c8 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -33,6 +33,7 @@ class MctlLadder;
 struct Ring;
 class StaticANIObject;
 struct Swinger;
+struct WalkingBearder;
 
 int defaultUpdateCursor();
 
@@ -585,6 +586,33 @@ public:
 	bool scene28_headBeardedFlipper;
 	bool scene28_lift6inside;
 
+	int scene29_var01;
+	int scene29_var02;
+	int scene29_var03;
+	int scene29_var04;
+	StaticANIObject *scene29_porter;
+	StaticANIObject *scene29_shooter1;
+	StaticANIObject *scene29_shooter2;
+	StaticANIObject *scene29_ass;
+	BallChain scene29_var05;
+	BallChain scene29_var06;
+	BallChain scene29_var07;
+	BallChain scene29_var08;
+	int scene29_var09;
+	int scene29_var10;
+	int scene29_var11;
+	int scene29_var12;
+	int scene29_var13;
+	int scene29_var14;
+	int scene29_var15;
+	int scene29_var16;
+	int scene29_var17;
+	int scene29_var18;
+	Common::Array<WalkingBearder *> scene29_var19;
+	int scene29_var20;
+	int scene29_var21;
+	MGM scene29_mgm;
+
 	StaticANIObject *scene30_leg;
 	int scene30_liftFlag;
 
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index 9efb428..27d45c2 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -71,7 +71,7 @@ void scene29_initScene(Scene *sc) {
 	g_vars->scene29_var08.cPlex = 0;
 
 	ani = sc->getStaticANIObject1ById(ANI_SHELL_GREEN, -1);
-	Ball *b = g_vars->scene29_var05->sub04(g_vars->scene29_var05.field_8, 0);
+	Ball *b = g_vars->scene29_var05.sub04(g_vars->scene29_var05.field_8, 0);
 	b->ani = ani;
 
 	if (g_vars->scene29_var05.field_8)
@@ -86,7 +86,7 @@ void scene29_initScene(Scene *sc) {
 
 		sc->addStaticANIObject(newani, 1);
 
-		b = g_vars->scene29_var05->sub04(g_vars->scene29_var05.field_8, 0);
+		b = g_vars->scene29_var05.sub04(g_vars->scene29_var05.field_8, 0);
 		b->ani = ani;
 
 		if (g_vars->scene29_var05.field_8)
@@ -115,7 +115,7 @@ void scene29_initScene(Scene *sc) {
 
 	ani = sc->getStaticANIObject1ById(ANI_SHELL_RED, -1);
 
-	b = g_vars->scene29_var06->sub04(g_vars->scene29_var06.field_8, 0);
+	b = g_vars->scene29_var06.sub04(g_vars->scene29_var06.field_8, 0);
 	b->ani = ani;
 
 	if (g_vars->scene29_var06.field_8)
@@ -130,7 +130,7 @@ void scene29_initScene(Scene *sc) {
 
 		sc->addStaticANIObject(newani, 1);
 
-		b = g_vars->scene29_var06->sub04(g_vars->scene29_var06.field_8, 0);
+		b = g_vars->scene29_var06.sub04(g_vars->scene29_var06.field_8, 0);
 		b->ani = ani;
 
 		if (g_vars->scene29_var06.field_8)
@@ -143,7 +143,7 @@ void scene29_initScene(Scene *sc) {
 
 	g_vars->scene29_var19.clear();
 
-	ani = new StaticANIObject(accessScene(SC_COMMON)->getStaticANIObject1ById(ANI_BEARDED_CMN, -1));
+	ani = new StaticANIObject(g_fp->accessScene(SC_COMMON)->getStaticANIObject1ById(ANI_BEARDED_CMN, -1));
 
 	ani->_statics = ani->getStaticsById(ST_BRDCMN_EMPTY);
 
@@ -270,11 +270,11 @@ int sceneHandler29(ExCommand *cmd) {
 
 	case MSG_SC29_LAUGH:
 		if (g_vars->scene29_var18 == ANI_SHELL_GREEN) {
-			playSound(SND_29_028, 0);
+			g_fp->playSound(SND_29_028, 0);
 			break;
 		}
 
-		playSound(SND_29_029, 0);
+		g_fp->playSound(SND_29_029, 0);
 
 		break;
 
@@ -296,7 +296,7 @@ int sceneHandler29(ExCommand *cmd) {
 
 	case MSG_SC29_SHOWLASTGREEN:
 		if (g_vars->scene29_var05.numBalls) {
-			g_vars->scene29_var05.field_8->ani->show1(-1, -1, (Objects)-1, 0);
+			g_vars->scene29_var05.field_8->ani->show1(-1, -1, -1, 0);
 			g_vars->scene29_var05.field_8->ani->startAnim(MV_SHG_HITASS, 0, -1);
 		}
 
@@ -312,13 +312,14 @@ int sceneHandler29(ExCommand *cmd) {
 		getGameLoaderInteractionController()->enableFlag24();
 		break;
 
-	case MSG_SC29_STOPRIDE:
+	case MSG_SC29_DISABLERIDEBACK:
 		g_vars->scene29_var12 = 0;
 		break;
 
-	case MSG_SC29_DISABLERIDEBACK:
+	case MSG_SC29_ENABLERIDEBACK:
 		g_vars->scene29_var12 = 1;
-		// fall through
+		g_vars->scene29_var11 = 0;
+		break;
 
 	case MSG_SC29_DISABLEPORTER:
 		g_vars->scene29_var11 = 0;
@@ -333,8 +334,9 @@ int sceneHandler29(ExCommand *cmd) {
 	case 29:
 		if (!g_vars->scene29_var09 || g_vars->scene29_var10) {
 			if (!g_vars->scene29_var10) {
-				v6 = g_fp->_currentScene->getStaticANIObjectAtPos(g_fp->_sceneRect.left + cmd->_x, g_fp->_sceneRect.top + cmd->_y);
-				if (v6 && v6 == g_vars->scene29_porter) {
+				StaticANIObject *ani = g_fp->_currentScene->getStaticANIObjectAtPos(g_fp->_sceneRect.left + cmd->_x, g_fp->_sceneRect.top + cmd->_y);
+
+				if (ani && ani == g_vars->scene29_porter) {
 					sceneHandler29_clickPorter(cmd);
 
 					cmd->_messageKind = 0;
@@ -361,7 +363,7 @@ int sceneHandler29(ExCommand *cmd) {
 			if (g_vars->scene29_var20 > g_fp->_sceneRect.right - 500)
 				g_fp->_currentScene->_x = g_fp->_sceneRect.right - g_vars->scene29_var20 - 350;
 
-			if (g_vars->scene29_var20 < g_sceneRect.left + 100)
+			if (g_vars->scene29_var20 < g_fp->_sceneRect.left + 100)
 				g_fp->_currentScene->_x = g_vars->scene29_var20 - g_fp->_sceneRect.left - 100;
 
 		} else if (g_fp->_aniMan2) {
@@ -382,9 +384,9 @@ int sceneHandler29(ExCommand *cmd) {
 		if (!g_vars->scene29_porter->_movement)
 			g_vars->scene29_porter->startAnim(MV_PTR_MOVEFAST, 0, -1);
 
-		if (g_vars->scene29_var09) {
+		if (g_vars->scene29_var09)
 			sceneHandler29_manFromL();
-		else if (g_vars->scene29_var10 && !g_aniMan->_movement)
+		else if (g_vars->scene29_var10 && !g_fp->_aniMan->_movement)
 			sceneHandler29_sub05();
 
 		if (g_vars->scene29_var11)
@@ -400,7 +402,7 @@ int sceneHandler29(ExCommand *cmd) {
 		sceneHandler29_animBearded();
 
 		g_fp->_behaviorManager->updateBehaviors();
-		startSceneTrack();
+		g_fp->startSceneTrack();
 
 		break;
 	}


Commit: 202804d8d389bbfef9eac3d5f0991e543d67d912
    https://github.com/scummvm/scummvm/commit/202804d8d389bbfef9eac3d5f0991e543d67d912
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-25T00:28:52+02:00

Commit Message:
FULLPIPE: Implement scene29_updateCursor()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/scenes/scene29.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 7924b33..5e18723 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1302,6 +1302,7 @@ namespace Fullpipe {
 #define MV_PTR_MOVEFAST 2102
 #define MV_SHG_HITASS 2151
 #define MV_SHR_HITASS 2152
+#define PIC_SC29_LTRUBA 2081
 #define SND_29_028 4758
 #define SND_29_029 4759
 #define ST_ASS_NORM 2122
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index 27d45c2..ee6a159 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -410,4 +410,23 @@ int sceneHandler29(ExCommand *cmd) {
 	return 0;
 }
 
+int scene29_updateCursor() {
+	g_fp->updateCursorCommon();
+
+	if (g_vars->scene29_var10) {
+		if (g_fp->_cursorId != PIC_CSR_DEFAULT_INV && g_fp->_cursorId != PIC_CSR_ITN_INV)
+			g_fp->_cursorId = -1;
+	} else if (g_vars->scene29_var09) {
+		if (g_fp->_cursorId != PIC_CSR_DEFAULT_INV && g_fp->_cursorId != PIC_CSR_ITN_INV)
+			g_fp->_cursorId = PIC_CSR_DEFAULT;
+	} else if (g_fp->_objectIdAtCursor == ANI_PORTER) {
+		if (g_fp->_cursorId == PIC_CSR_DEFAULT)
+			g_fp->_cursorId = PIC_CSR_ITN;
+	} else {
+		if (g_fp->_objectIdAtCursor == PIC_SC29_LTRUBA && g_fp->_cursorId == PIC_CSR_ITN)
+			g_fp->_cursorId = PIC_CSR_GOL;
+	}
+	return g_fp->_cursorId;
+}
+
 } // End of namespace Fullpipe


Commit: b3b27c3d0eeb454d43f27afcdb609ada3498fc17
    https://github.com/scummvm/scummvm/commit/b3b27c3d0eeb454d43f27afcdb609ada3498fc17
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-25T00:28:52+02:00

Commit Message:
FULLPIPE: Enable scene29

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



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 4746cb2..3fe8704 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -963,7 +963,6 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		_updateCursorCallback = scene28_updateCursor;
 		break;
 
-#if 0
 	case SC_29:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_29");
 		scene->preloadMovements(sceneVar);
@@ -974,7 +973,6 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		addMessageHandler(sceneHandler29, 2);
 		_updateCursorCallback = scene29_updateCursor;
 		break;
-#endif
 
 	case SC_30:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_30");
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 04d84c8..ef6af54 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -164,6 +164,10 @@ void scene28_initScene(Scene *sc);
 int sceneHandler28(ExCommand *ex);
 int scene28_updateCursor();
 
+int scene29_updateCursor();
+void scene29_initScene(Scene *sc);
+int sceneHandler29(ExCommand *cmd);
+
 int scene30_updateCursor();
 void scene30_initScene(Scene *sc, int flag);
 int sceneHandler30(ExCommand *cmd);






More information about the Scummvm-git-logs mailing list