[Scummvm-git-logs] scummvm master -> 580223e2b28c46581c0af8d4af24d095d6d3f52f

[mgerhardy]

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:
49590e1f4c TWINE: add SCENE_SIZE_MAX comment
580223e2b2 TWINE: added Lupin Island Destiny and Prequel mod support


Commit: 49590e1f4c6635b980e95b577b956dcf594af7df
    https://github.com/scummvm/scummvm/commit/49590e1f4c6635b980e95b577b956dcf594af7df
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-23T17:43:59+02:00

Commit Message:
TWINE: add SCENE_SIZE_MAX comment

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


diff --git a/engines/twine/scene/scene.cpp b/engines/twine/scene/scene.cpp
index 32404608c4..ac9ae29e02 100644
--- a/engines/twine/scene/scene.cpp
+++ b/engines/twine/scene/scene.cpp
@@ -737,7 +737,7 @@ void Scene::processActorZones(int32 actorIdx) {
 					destPos.x += _engine->_movements->_processActor.x;
 					destPos.z += _engine->_movements->_processActor.z;
 
-					if (destPos.x >= 0 && destPos.z >= 0 && destPos.x <= 0x7E00 && destPos.z <= 0x7E00) {
+					if (destPos.x >= 0 && destPos.z >= 0 && destPos.x <= 0x7E00 && destPos.z <= 0x7E00) { // SCENE_SIZE_MAX
 						if (_engine->_grid->getBrickShape(destPos.x, actor->_pos.y + ANGLE_90, destPos.z) != ShapeType::kNone) {
 							_currentActorInZone = true;
 							if (actor->_pos.y >= ABS(zone->mins.y + zone->maxs.y) / 2) {


Commit: 580223e2b28c46581c0af8d4af24d095d6d3f52f
    https://github.com/scummvm/scummvm/commit/580223e2b28c46581c0af8d4af24d095d6d3f52f
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-23T17:43:59+02:00

Commit Message:
TWINE: added Lupin Island Destiny and Prequel mod support

see https://bugs.scummvm.org/ticket/12833

Changed paths:
    engines/twine/detection.cpp
    engines/twine/detection.h
    engines/twine/twine.cpp
    engines/twine/twine.h


diff --git a/engines/twine/detection.cpp b/engines/twine/detection.cpp
index 868f6df55c..447d46072d 100644
--- a/engines/twine/detection.cpp
+++ b/engines/twine/detection.cpp
@@ -479,6 +479,30 @@ static const ADGameDescription twineGameDescriptions[] = {
 		GUIO1(GUIO_NONE)
 	},
 
+	// https://forum.magicball.net/showthread.php?p=386653#post386653
+	// LBA:LID Demo v1.0
+	{
+		"lba",
+		"LBA: Lupin Island Destiny",
+		AD_ENTRY1s("TEXT.HQR", "859339686e87f5c9f71253c25610a9fd", 240238),
+		Common::EN_ANY,
+		Common::kPlatformDOS,
+		ADGF_UNSTABLE | ADGF_DEMO | TwinE::TF_MOD,
+		GUIO1(GUIO_NONE)
+	},
+
+	// https://forum.magicball.net/showthread.php?t=16549
+	// LBA:Prequel Demo v1.0
+	{
+		"lba",
+		"LBA: Prequel",
+		AD_ENTRY1s("TEXT.HQR", "79352a6f59ff2d8984573bfa421ef346", 259722),
+		Common::EN_ANY,
+		Common::kPlatformDOS,
+		ADGF_UNSTABLE | ADGF_DEMO | TwinE::TF_MOD,
+		GUIO1(GUIO_NONE)
+	},
+
 	// Little Big Adventure 2
 
 	// Little Big Adventure 2 - Original European Version (EN, FR, DE, IT, ES)
diff --git a/engines/twine/detection.h b/engines/twine/detection.h
index b255b46b84..e760defb9e 100644
--- a/engines/twine/detection.h
+++ b/engines/twine/detection.h
@@ -35,7 +35,8 @@ enum TwineFeatureFlags {
 	TF_VERSION_USA = (1 << 1),
 	TF_VERSION_CUSTOM = (1 << 2),
 	TF_USE_GIF = (1 << 3),
-	TF_DOTEMU_ENHANCED = (1 << 4)
+	TF_DOTEMU_ENHANCED = (1 << 4),
+	TF_MOD = (1 << 5)
 };
 
 } // End of namespace TwinE
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index bf1453a054..c5a6041c01 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -706,7 +706,7 @@ int32 TwinEEngine::runGameEngine() { // mainLoopInteration
 	}
 
 	if (_scene->_needChangeScene > -1) {
-		if (isDemo() && isLBA1()) {
+		if (!isMod() && isDemo() && isLBA1()) {
 			// the demo only has these two scenes
 			if (_scene->_needChangeScene != LBA1SceneId::Citadel_Island_Prison && _scene->_needChangeScene != LBA1SceneId::Citadel_Island_outside_the_citadel) {
 				return 1;
diff --git a/engines/twine/twine.h b/engines/twine/twine.h
index 5631e8da10..1884039657 100644
--- a/engines/twine/twine.h
+++ b/engines/twine/twine.h
@@ -248,6 +248,7 @@ public:
 
 	bool isLBA1() const { return _gameType == TwineGameType::GType_LBA; }
 	bool isLBA2() const { return _gameType == TwineGameType::GType_LBA2; }
+	bool isMod() const { return (_gameFlags & TwinE::TF_MOD) != 0; }
 	bool isDemo() const { return (_gameFlags & ADGF_DEMO) != 0; };
 	const char *getGameId() const;