[Scummvm-git-logs] scummvm master -> ea688bb971d8745c4ec68c6b5c20083a2a281201

[sluicebox]

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:
ca2b6a9917 TWINE: Fix forward declarations
ea688bb971 SCI: Add detection for German Castle of Dr. Brain


Commit: ca2b6a991737e3530336806e923bd36d3efa970b
    https://github.com/scummvm/scummvm/commit/ca2b6a991737e3530336806e923bd36d3efa970b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-08-26T05:00:11-05:00

Commit Message:
TWINE: Fix forward declarations

Fixes MSVC build

Changed paths:
    engines/twine/scene/collision.h
    engines/twine/scene/grid.h
    engines/twine/scene/movements.h


diff --git a/engines/twine/scene/collision.h b/engines/twine/scene/collision.h
index 4585f9bfc2..25f02d4e93 100644
--- a/engines/twine/scene/collision.h
+++ b/engines/twine/scene/collision.h
@@ -29,7 +29,7 @@
 namespace TwinE {
 
 class ActorStruct;
-class ExtraListStruct;
+struct ExtraListStruct;
 class TwinEEngine;
 
 class Collision {
diff --git a/engines/twine/scene/grid.h b/engines/twine/scene/grid.h
index b2791d2239..e2e1c93740 100644
--- a/engines/twine/scene/grid.h
+++ b/engines/twine/scene/grid.h
@@ -34,7 +34,7 @@ class ManagedSurface;
 
 namespace TwinE {
 
-struct ActorStruct;
+class ActorStruct;
 
 /** Block fragment entry */
 struct BlockEntry {
diff --git a/engines/twine/scene/movements.h b/engines/twine/scene/movements.h
index 3173157687..ae53dc35d4 100644
--- a/engines/twine/scene/movements.h
+++ b/engines/twine/scene/movements.h
@@ -29,7 +29,7 @@
 namespace TwinE {
 
 class TwinEEngine;
-struct ActorStruct;
+class ActorStruct;
 struct ActorMoveStruct;
 
 class Movements {


Commit: ea688bb971d8745c4ec68c6b5c20083a2a281201
    https://github.com/scummvm/scummvm/commit/ea688bb971d8745c4ec68c6b5c20083a2a281201
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-08-26T05:06:08-05:00

Commit Message:
SCI: Add detection for German Castle of Dr. Brain

Changed paths:
    engines/sci/detection_tables.h


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 3e22b7ffbe..ed63664fde 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -172,6 +172,16 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		{"resource.007", 0, "063bb8ce4157c778cf30d1c912c006f1", 335631},
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO_STD16	},
+		
+	// Castle of Dr. Brain - German DOS Floppy 1.000 (also includes English language)
+	// SCI interpreter version 1.000.068
+	{"castlebrain", "", {
+		{"resource.map", 0, "a69c03fa6845e7d859a9d5bff9090aad", 2679},
+		{"resource.000", 0, "27ec5fa09cd12a7fd16e86d96a2ed245", 368428},
+		{"resource.001", 0, "6c3d1bb26ad532c94046bc9ac49b5ff4", 887474},
+		{"resource.002", 0, "2a30815661f457dcb49b19f9cce96af0", 1250595},
+		AD_LISTEND},
+		Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16	},
 
 	// Castle of Dr. Brain - Spanish DOS (also includes english language)
 	// SCI interpreter version 1.000.510