[Scummvm-git-logs] scummvm master -> 84d12f9a59bd757d8b948d8ddc9a71377df12ebf

[bluegr]

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:
84d12f9a59 GOB: change resolution to 640x400 & use always 400 for height for Adi 2


Commit: 84d12f9a59bd757d8b948d8ddc9a71377df12ebf
    https://github.com/scummvm/scummvm/commit/84d12f9a59bd757d8b948d8ddc9a71377df12ebf
Author: Benjamin Funke (58399929+BJNFNE at users.noreply.github.com)
Date: 2023-08-27T14:23:01+03:00

Commit Message:
GOB: change resolution to 640x400 & use always 400 for height for Adi 2

Changed paths:
    engines/gob/detection/tables_adi2.h
    engines/gob/inter_v2.cpp


diff --git a/engines/gob/detection/tables_adi2.h b/engines/gob/detection/tables_adi2.h
index 871d8898a6a..2315c71817c 100644
--- a/engines/gob/detection/tables_adi2.h
+++ b/engines/gob/detection/tables_adi2.h
@@ -51,7 +51,7 @@
 		GUIO1(GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,
-	kFeatures640x480,
+	kFeatures640x400,
 	"adi2.stk", "ediintro.tot", 0
 },
 { // Found in french ADI 2 Francais-Maths CE2. Exact version not specified.
@@ -65,7 +65,7 @@
 		GUIO1(GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,
-	kFeatures640x480,
+	kFeatures640x400,
 	"adi2.stk", "ediintro.tot", 0
 },
 {
@@ -79,7 +79,7 @@
 		GUIO1(GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,
-	kFeatures640x480,
+	kFeatures640x400,
 	"adi2.stk", "ediintro.tot", 0
 },
 {
@@ -93,7 +93,7 @@
 		GUIO1(GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,
-	kFeatures640x480,
+	kFeatures640x400,
 	"adi2.stk", "ediintro.tot", 0
 },
 {
@@ -107,7 +107,7 @@
 		GUIO1(GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,
-	kFeatures640x480,
+	kFeatures640x400,
 	"adi2.stk", "ediintro.tot", 0
 },
 
@@ -124,7 +124,7 @@
 		GUIO1(GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,
-	kFeatures640x480,
+	kFeatures640x400,
 	"adi2.stk", "ediintro.tot", 0
 },
 {
@@ -152,7 +152,7 @@
 		GUIO1(GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,
-	kFeatures640x480,
+	kFeatures640x400,
 	"adi2.stk", "ediintro.tot", 0
 },
 
@@ -169,7 +169,7 @@
 		GUIO1(GUIO_NOASPECT)
 	},
 	kGameTypeAdi2,
-	kFeatures640x480,
+	kFeatures640x400,
 	"adi2.stk", "ediintro.tot", 0
 },
 
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 2171dea79a5..e0b8bbf96c0 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -823,7 +823,7 @@ void Inter_v2::o2_initScreen() {
 
 		}
 	}
-	else if (_vm->getGameType() == kGameTypeAdibou1) {
+	else if (_vm->getGameType() == kGameTypeAdibou1 || _vm->getGameType() == kGameTypeAdi2) {
 		if (_vm->is640x400() && width == 640 && height == 480) {
 			// Force height to 400: the game is mostly scaled from the 320x200 version and
 			// never makes use of the space beyond height 400, so we can get rid of it.