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

[sev-]

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:
bc3eb3b22b FULLPIPE: Implement scene18_setupEntrance()
f504635cbd FULLPIPE: Implement scene19_setSugarState()


Commit: bc3eb3b22b5f8ce46e8a4c596b408c667fade2fa
    https://github.com/scummvm/scummvm/commit/bc3eb3b22b5f8ce46e8a4c596b408c667fade2fa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-03T13:40:05-08:00

Commit Message:
FULLPIPE: Implement scene18_setupEntrance()

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



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 4f0b2bd..2844ad4 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -797,7 +797,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 
 #if 0
 	case SC_18:
-		sub_40E1B0();
+		scene18_setupEntrance();
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_18");
 		scene->preloadMovements(sceneVar);
 		g_fp->stopAllSounds();
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 1016493..7ac3e69 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -63,6 +63,13 @@ void scene18_preload() {
 	}
 }
 
+void scene18_setupEntrance() {
+	GameVar *var = g_fp->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->getSubVarByName("SAVEGAME");
+
+	if (var->getSubVarAsInt("Entrance") == TrubaRight)
+		var->setSubVarAsInt("Entrance", TrubaLeft);
+}
+
 void scene19_setMovements(Scene *sc, int entranceId) {
 	if (entranceId == TrubaRight) {
 		g_vars->scene18_var15 = 1;


Commit: f504635cbded10d9af2dda00369e6ebf19957d8e
    https://github.com/scummvm/scummvm/commit/f504635cbded10d9af2dda00369e6ebf19957d8e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-03T13:40:05-08:00

Commit Message:
FULLPIPE: Implement scene19_setSugarState()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index b825a1d..83fafee 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -887,11 +887,13 @@ namespace Fullpipe {
 #define SND_18_010 4994
 
 // Scene 19
+#define ANI_CORDIE 1529
 #define ANI_WHIRLGIG_19 1302
 #define MV_WHR19_SPIN 1317
 #define PIC_SC19_RTRUBA3 1515
 #define SND_19_015 3928
 #define SND_19_016 4995
+#define ST_CDI_EMPTY2 1543
 #define ST_KSL_NORM 1461
 
 // Scene 20
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 7ac3e69..5e69ec7 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -70,6 +70,16 @@ void scene18_setupEntrance() {
 		var->setSubVarAsInt("Entrance", TrubaLeft);
 }
 
+void scene19_setSugarState(Scene *sc) {
+	if (g_fp->getObjectState(sO_Sugar) != g_fp->getObjectEnumState(sO_Sugar, sO_Present)) {
+		Scene *oldsc = g_fp->_currentScene;
+
+		g_fp->_currentScene = sc;
+		sc->getStaticANIObject1ById(ANI_CORDIE, -1)->changeStatics2(ST_CDI_EMPTY2);
+		g_fp->_currentScene = oldsc;
+	}
+}
+
 void scene19_setMovements(Scene *sc, int entranceId) {
 	if (entranceId == TrubaRight) {
 		g_vars->scene18_var15 = 1;