Merge branch 'master' of github.com:scummvm/scummvm

engines/fullpipe/fullpipe.cpp

@@ -94,6 +94,7 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
 	_isProcessingMessages = false;
 
 	_musicAllowed = -1;
+	_musicGameVar = 0;
 
 	_aniMan = 0;
 	_aniMan2 = 0;

engines/fullpipe/module.mk

@@ -24,6 +24,7 @@ MODULE_OBJS = \
 	stateloader.o \
 	statics.o \
 	utils.o \
+	scenes/sceneIntro.o \
 	scenes/scene01.o \
 	scenes/scene02.o \
 	scenes/scene03.o \
@@ -51,8 +52,7 @@ MODULE_OBJS = \
 	scenes/scene30.o \
 	scenes/scene31.o \
 	scenes/scene36.o \
-	scenes/sceneDbg.o \
-	scenes/sceneIntro.o
+	scenes/sceneDbg.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_FULLPIPE), DYNAMIC_PLUGIN)

engines/fullpipe/scenes.cpp

@@ -792,6 +792,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		addMessageHandler(sceneHandler27, 2);
 		_updateCursorCallback = scene27_updateCursor;
 		break;
+#endif
 
 	case SC_28:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_28");
@@ -804,6 +805,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		_updateCursorCallback = scene28_updateCursor;
 		break;
 
+#if 0
 	case SC_29:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_29");
 		scene->preloadMovements(sceneVar);

engines/fullpipe/scenes.h

@@ -132,6 +132,10 @@ void scene26_setupDrop(Scene *sc);
 int sceneHandler26(ExCommand *cmd);
 int scene26_updateCursor();
 
+void scene28_initScene(Scene *sc);
+ int sceneHandler28(ExCommand *ex);
+int scene28_updateCursor();
+
 int scene30_updateCursor();
 void scene30_initScene(Scene *sc, int flag);
 int sceneHandler30(ExCommand *cmd);
@@ -428,8 +432,8 @@ class Vars {
 	int scene28_var04;
 	int scene28_var05;
 	int scene28_var06;
-	int scene28_var07;
-	int scene28_var08;
+	PictureObject *scene28_var07;
+	PictureObject *scene28_var08;
 	int scene28_var09;
 	int scene28_var10;
 	int scene28_var11;

engines/fullpipe/scenes/scene16.cpp

@@ -121,7 +121,7 @@ int scene16_updateCursor() {
 }
 
 void sceneHandler16_laughSound() {
-	int snd;
+	int snd = SND_16_035;
 
 	switch (g_vars->scene16_sound) {
 	case SND_16_034:
@@ -191,7 +191,7 @@ void sceneHandler16_fillMug() {
 			mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLOUT), 0, 1);
 
 			mq->replaceKeyCode(-1, g_vars->scene16_walkingGirl->_okeyCode);
-			if (mq->chain(g_vars->scene16_walkingGirl) || !mq)
+			if (mq->chain(g_vars->scene16_walkingGirl))
 				return;
 		}
 		delete mq;

engines/fullpipe/scenes/scene22.cpp

@@ -261,8 +261,7 @@ void sceneHandler22_stoolLogic(ExCommand *cmd) {
 
 				mq->deleteExCommandByIndex(0, 0);
 
-				if (mq)
-					delete mq;
+				delete mq;
 
 				mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC22_TOSTOOL_R), 0, 0);
 

engines/fullpipe/scenes/scene25.cpp

@@ -436,7 +436,7 @@ void sceneHandler25_backToPipe() {
 
 void sceneHandler25_walkOnLadder(StaticANIObject *ani, Common::Point *pnt, MessageQueue *mq, int flag) {
 	int aniY = ani->_oy;
-	int newx, newy;
+	int newx = 0, newy = 0;
 	Common::Point point;
 	ExCommand *ex;
 
@@ -488,7 +488,7 @@ void sceneHandler25_walkOnLadder(StaticANIObject *ani, Common::Point *pnt, Messa
 	for (int i = 0; i < numObsolete; i++)
 		mq->deleteExCommandByIndex(0, 1);
 
-    ex = new ExCommand(ani->_id, 34, 256, 0, 0, 0, 1, 0, 0, 0);
+	ex = new ExCommand(ani->_id, 34, 256, 0, 0, 0, 1, 0, 0, 0);
 
 	ex->_field_14 = 256;
 	ex->_messageNum = 0;
@@ -509,6 +509,9 @@ void sceneHandler25_walkOnLadder(StaticANIObject *ani, Common::Point *pnt, Messa
 
 		ani->_movement->setDynamicPhaseIndex(idx);
 	} else {
+		if (!lastEx)
+			error("sceneHandler25_walkOnLadder(): Incorrect state. Please report this to sev");
+
 		ani->changeStatics2(ani->getMovementById(lastEx->_messageNum)->_staticsObj1->_staticsId);
 		ani->setOXY(newx, newy);
 		ani->restartMessageQueue(mq);
@@ -588,7 +591,7 @@ int sceneHandler25(ExCommand *cmd) {
 		break;
 
 	case 33:
-        if (g_fp->_aniMan2) {
+		if (g_fp->_aniMan2) {
 			int x = g_fp->_aniMan2->_ox;
 			int y = g_fp->_aniMan2->_oy;
 

engines/fullpipe/scenes/scene28.cpp

@@ -36,7 +36,7 @@
 
 namespace Fullpipe {
 
-void scene28_initScene() {
+void scene28_initScene(Scene *sc) {
 	g_vars->scene28_var01 = 200;
 	g_vars->scene28_var02 = 200;
 	g_vars->scene28_var03 = 300;
@@ -54,4 +54,241 @@ void scene28_initScene() {
 	g_fp->initArcadeKeys("SC_28");
 }
 
+int scene28_updateCursor() {
+	g_fp->updateCursorCommon();
+	if (g_fp->_objectIdAtCursor == ANI_LIFT || g_fp->_objectIdAtCursor == ANI_LIFT_28)
+		if (g_fp->_cursorId == PIC_CSR_DEFAULT)
+			g_fp->_cursorId = PIC_CSR_ITN;
+
+	return g_fp->_cursorId;
+}
+
+void sceneHandler28_lift1ShowAfter() {
+	warning("STUB: sceneHandler28_lift1ShowAfter()");
+}
+
+void sceneHandler28_makeFaces(ExCommand *cmd) {
+	warning("STUB: sceneHandler28_makeFaces()");
+}
+
+void sceneHandler28_trySecondaryPers() {
+	warning("STUB: sceneHandler28_trySecondaryPers()");
+}
+
+void sceneHandler28_turnOn2() {
+	warning("STUB: sceneHandler28_turnOn2()");
+}
+
+void sceneHandler28_startWork1() {
+	warning("STUB: sceneHandler28_startWork1()");
+}
+
+void sceneHandler28_clickLift(int keyCode) {
+	warning("STUB: sceneHandler28_clickLift()");
+}
+
+void sceneHandler28_lift0Start() {
+	chainQueue(QU_SC28_LIFT0_START, 1);
+}
+
+void sceneHandler28_lift1Start() {
+	warning("STUB: sceneHandler28_lift1Start()");
+}
+
+void sceneHandler28_lift2Start() {
+	chainQueue(QU_SC28_LIFT2_START, 1);
+}
+
+void sceneHandler28_lift3Start() {
+	chainQueue(QU_SC28_LIFT3_START, 1);
+}
+
+void sceneHandler28_lift4Start() {
+	warning("STUB: sceneHandler28_lift4Start()");
+}
+
+void sceneHandler28_lift5Start() {
+	chainQueue(QU_SC28_LIFT5_START, 1);
+}
+
+void sceneHandler28_lift6Start() {
+	warning("STUB: sceneHandler28_lift6Start()");
+}
+
+
+int sceneHandler28(ExCommand *cmd) {
+	if (cmd->_messageKind != 17)
+		return 0;
+
+	switch (cmd->_messageNum) {
+	case MSG_SC28_LIFT6MUSIC:
+		g_fp->playTrack(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_28"), "MUSIC_TIOTIA", 1);
+		break;
+
+	case MSG_SC28_LIFT6INSIDE:
+		g_vars->scene28_var11 = 1;
+		break;
+
+	case MSG_SC28_LIFT1_SHOWAFTER:
+		sceneHandler28_lift1ShowAfter();
+		break;
+
+	case MSG_SC28_MAKEFACES:
+		sceneHandler28_makeFaces(cmd);
+		break;
+
+	case MSG_SC28_TRYVTORPERS:
+		sceneHandler28_trySecondaryPers();
+		break;
+
+	case MSG_SC28_TURNOFF_0:
+		g_vars->scene28_var08 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK0, 0);
+		g_vars->scene28_var08->_flags |= 4;
+		break;
+
+	case MSG_SC28_TURNON_0:
+		g_vars->scene28_var07 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK0, 0);
+		break;
+
+	case MSG_SC28_TURNON_1:
+		g_vars->scene28_var07 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK1, 0);
+		break;
+
+	case MSG_SC28_TURNOFF_1:
+		g_vars->scene28_var08 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK1, 0);
+		g_vars->scene28_var08->_flags |= 4;
+		break;
+
+	case MSG_SC28_TURNON_2:
+		g_vars->scene28_var07 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK2, 0);
+		sceneHandler28_turnOn2();
+		break;
+
+	case MSG_SC28_TURNOFF_2:
+		g_vars->scene28_var08 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK2, 0);
+		g_vars->scene28_var08->_flags |= 4;
+		break;
+
+	case MSG_SC28_TURNON_3:
+		g_vars->scene28_var07 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK3, 0);
+		break;
+
+	case MSG_SC28_TURNOFF_3:
+		g_vars->scene28_var08 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK3, 0);
+		g_vars->scene28_var08->_flags |= 4;
+		break;
+
+	case MSG_SC28_TURNON_4:
+		g_vars->scene28_var07 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK4, 0);
+		break;
+
+	case MSG_SC28_TURNOFF_4:
+		g_vars->scene28_var08 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK4, 0);
+		g_vars->scene28_var08->_flags |= 4;
+		break;
+
+	case MSG_SC28_TURNON_6:
+		g_vars->scene28_var07 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK6, 0);
+		break;
+
+	case MSG_SC28_TURNOFF_6:
+		g_vars->scene28_var08 = g_fp->_currentScene->getPictureObjectById(PIC_SC28_DARK6, 0);
+		g_vars->scene28_var08->_flags |= 4;
+		break;
+
+	case MSG_SC28_STARTWORK1:
+		sceneHandler28_startWork1();
+		break;
+
+	case MSG_SC28_CLICKLIFT:
+		sceneHandler28_clickLift(cmd->_keyCode);
+		break;
+
+	case MSG_SC28_ENDLIFT1:
+	case MSG_SC28_ENDLIFT6:
+	case MSG_SC28_ENDCABIN:
+		g_fp->_behaviorManager->setFlagByStaticAniObject(g_fp->_aniMan, 1);
+		g_fp->_aniMan->_flags &= 0xFEFF;
+		break;
+
+	case 29:
+		{
+			if (g_vars->scene28_var11) {
+				chainObjQueue(g_fp->_aniMan, QU_SC28_LIFT6_END, 1);
+
+				g_fp->playTrack(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_28"), "MUSIC", 1);
+
+				g_vars->scene28_var11 = 0;
+			}
+
+			StaticANIObject *ani = g_fp->_currentScene->getStaticANIObjectAtPos(cmd->_sceneClickX, cmd->_sceneClickY);
+
+			if (ani)
+				if (ani->_id == ANI_LIFT || ani->_id == ANI_LIFT_28 ) {
+					sceneHandler28_clickLift(ani->_okeyCode);
+
+					cmd->_messageKind = 0;
+					break;
+				}
+
+			if (!ani || !canInteractAny(g_fp->_aniMan, ani, cmd->_keyCode)) {
+				int picId = g_fp->_currentScene->getPictureObjectIdAtPos(cmd->_sceneClickX, cmd->_sceneClickY);
+				PictureObject *pic = g_fp->_currentScene->getPictureObjectById(picId, 0);
+
+				if (!pic || !canInteractAny(g_fp->_aniMan, pic, cmd->_keyCode)) {
+					if ((g_fp->_sceneRect.right - cmd->_sceneClickX < 47 && g_fp->_sceneRect.right < g_fp->_sceneWidth - 1)
+						|| (cmd->_sceneClickX - g_fp->_sceneRect.left < 47 && g_fp->_sceneRect.left > 0))
+						g_fp->processArcade(cmd);
+				}
+			}
+			break;
+		}
+
+	case 33:
+		if (g_fp->_aniMan2) {
+			int x = g_fp->_aniMan2->_ox;
+
+			if (x < g_fp->_sceneRect.left + g_vars->scene28_var01)
+				g_fp->_currentScene->_x = x - g_vars->scene28_var03 - g_fp->_sceneRect.left;
+
+			if (x > g_fp->_sceneRect.right - g_vars->scene28_var01)
+				g_fp->_currentScene->_x = x + g_vars->scene28_var03 - g_fp->_sceneRect.right;
+		}
+
+		if (g_vars->scene28_var07) {
+			if (g_vars->scene28_var07->_picture->getAlpha() > 10) {
+				g_vars->scene28_var07->_picture->setAlpha(g_vars->scene28_var07->_picture->getAlpha() - 10);
+			} else {
+				g_vars->scene28_var07->_flags &= 0xFFFB;
+
+				g_vars->scene28_var07 = 0;
+			}
+		}
+
+		if (g_vars->scene28_var08) {
+			if (g_vars->scene28_var08->_picture->getAlpha() < 0xF9u ) {
+				g_vars->scene28_var08->_picture->setAlpha(g_vars->scene28_var08->_picture->getAlpha() + 6);
+			} else {
+				g_vars->scene28_var08->_picture->setAlpha(0xff);
+
+				g_vars->scene28_var08 = 0;
+			}
+		}
+
+		g_fp->_floaters->update();
+
+		for (uint i = 0; i < g_fp->_floaters->_array2.size(); i++)
+			if (g_fp->_floaters->_array2[i]->val13 == 1)
+				g_fp->_floaters->_array2[i]->ani->_priority = 15;
+
+		g_fp->_behaviorManager->updateBehaviors();
+
+		g_fp->startSceneTrack();
+
+		break;
+	}
+
+	return 0;
+}
+
 } // End of namespace Fullpipe

engines/hopkins/hopkins.h

@@ -60,10 +60,6 @@
  */
 namespace Hopkins {
 
-#define DEBUG_BASIC 1
-#define DEBUG_INTERMEDIATE 2
-#define DEBUG_DETAILED 3
-
 #define SCREEN_WIDTH 640
 #define SCREEN_HEIGHT 480