[Scummvm-git-logs] scummvm master -> 65b6e897d213187f7dafafb92e3eda764fd13840

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
65b6e897d2 NGI: Fix Inconsistent character state (bug #9669)


Commit: 65b6e897d213187f7dafafb92e3eda764fd13840
    https://github.com/scummvm/scummvm/commit/65b6e897d213187f7dafafb92e3eda764fd13840
Author: Pragyansh Chaturvedi (r41k0u) (pragyanshchaturvedi18 at gmail.com)
Date: 2022-03-06T17:47:21+01:00

Commit Message:
NGI: Fix Inconsistent character state (bug #9669)

Changed paths:
    engines/ngi/fullpipe/scene32.cpp


diff --git a/engines/ngi/fullpipe/scene32.cpp b/engines/ngi/fullpipe/scene32.cpp
index d072025fe29..338b20c4670 100644
--- a/engines/ngi/fullpipe/scene32.cpp
+++ b/engines/ngi/fullpipe/scene32.cpp
@@ -91,7 +91,14 @@ void scene32_initScene(Scene *sc) {
 
 	g_nmi->initArcadeKeys("SC_32");
 
-	warning("cactus: %d, state: %d", g_nmi->getObjectState(sO_Cactus), g_vars->scene32_cactus->_statics->_staticsId);
+	if (g_nmi->getObjectState(sO_Cactus) == g_nmi->getObjectEnumState(sO_Cactus, sO_HasGrown)) {
+		g_nmi->_currentScene = sc;
+
+		g_vars->scene32_cactus->changeStatics2(ST_CTS_GROWUP);
+		g_vars->scene32_cactus->_priority = 22;
+
+		g_nmi->_currentScene = oldsc;
+	}
 }
 
 void scene32_setupMusic() {