[Scummvm-git-logs] scummvm master -> 443604edf1f14b99635a238fa3496854e8927818

[mgerhardy]

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:
443604edf1 TWINE: fixed triggering an error after applying the funfrock fix


Commit: 443604edf1f14b99635a238fa3496854e8927818
    https://github.com/scummvm/scummvm/commit/443604edf1f14b99635a238fa3496854e8927818
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2025-02-13T07:49:22+01:00

Commit Message:
TWINE: fixed triggering an error after applying the funfrock fix

Changed paths:
    engines/twine/scene/scene.cpp
    engines/twine/shared.h


diff --git a/engines/twine/scene/scene.cpp b/engines/twine/scene/scene.cpp
index 7ed0778438d..c9c587724ca 100644
--- a/engines/twine/scene/scene.cpp
+++ b/engines/twine/scene/scene.cpp
@@ -462,7 +462,7 @@ bool Scene::loadSceneLBA1() {
 				// https://bugs.scummvm.org/ticket/13819
 				// Set this zone to something invalid to fix a getting-stuck-bug
 				// the original value was ZoneType::kGrid (3)
-				_sceneZones[11].type = (ZoneType)50;
+				_sceneZones[11].type = ZoneType::kFunFrockFix;
 			}
 		}
 	}
@@ -784,6 +784,8 @@ void Scene::checkZoneSce(int32 actorIdx) {
 			switch (zone->type) {
 			default:
 				error("lba2 zone types not yet implemented");
+			case ZoneType::kFunFrockFix:
+				break;
 			case ZoneType::kCube:
 				if (IS_HERO(actorIdx) && actor->_lifePoint > 0) {
 					_newCube = zone->num;
diff --git a/engines/twine/shared.h b/engines/twine/shared.h
index e2eb4aac7ee..431630334e3 100644
--- a/engines/twine/shared.h
+++ b/engines/twine/shared.h
@@ -57,6 +57,9 @@
 #define GAMEFLAG_VIDEO_NEIGE2 207
 // Hamalayi Mountains, ski lift
 #define GAMEFLAG_VIDEO_SURF 208
+// Twinsen is no longer sick after he bought the catamaran
+// you get this video if you take the ferry after you've
+// bought the catamaran
 // Ferry #2 Citadel Island <-> Principal Island
 #define GAMEFLAG_VIDEO_BATEAU2 209
 // Fortress, Zoe Clone
@@ -420,7 +423,8 @@ enum class ZoneType {
 	// lba2
 	kEscalator = 7,
 	kHit = 8,
-	kRail = 9
+	kRail = 9,
+	kFunFrockFix = 50
 };
 
 #define SCENE_CEILING_GRID_FADE_1 (-1)