Merge pull request #4 from alexbevi/hopkins

HOPKINS: Merge compilation fixes under Linux and added detection entry
scummvm · Nov 21, 2012 · e738722 · e738722
2 parents 8e376cc + 7bd46c4
commit e738722
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
@@ -950,9 +950,9 @@ void ComputerManager::NAME_SCORE() {
 }
 
 void ComputerManager::IMPRIMESCORE() {
-	__int16 v0; 
-	__int16 v1; 
-	__int16 i; 
+	int16 v0; 
+	int16 v1; 
+	int16 i; 
 	char s[40]; 
 
 	sprintf(s, "%d", CASSESCORE);
@@ -969,8 +969,8 @@ void ComputerManager::IMPRIMESCORE() {
 }
 
 void ComputerManager::IMPSCORE(int a1, int a2) {
-	signed __int16 v2; 
-	__int16 v3; 
+	int16 v2; 
+	int16 v3; 
 
 	v2 = 203;
 	v3 = 3;
@@ -1096,9 +1096,9 @@ void ComputerManager::PRINT_HSCORE(byte *objectData, int a2, int a3, int a4) {
 
 int ComputerManager::DEP_BALLE() {
 	int v0; 
-	__int16 v1; 
+	int16 v1; 
 	int v2; 
-	signed __int16 v4; 
+	int16 v4; 
 
 	v4 = 0;
 	//(signed int)(6.0 * (long double)_vm->getRandomNumber( rand() / 2147483648.0) + 1;

diff --git a/engines/hopkins/detection_tables.h b/engines/hopkins/detection_tables.h
@@ -105,6 +105,23 @@ static const HopkinsGameDescription gameDescriptions[] = {
 			GUIO1(GUIO_NONE)
 		},
 	},
+	{
+		// Hopkins FBI Win95, provided by alexbevi
+		// Dec 15  1998 hopkins.exe
+		{
+			"hopkins",
+			0,
+			{
+				{"Hopkins.exe", 0, "a587762dd50d5933e1c89f9975180764", 378694},
+				{"RES_VAN.RES", 0, "f1693ac0b0859c8ecd8cb30ff43cf55f", 38296346},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NONE)
+		},
+	},
 	{
 		// Hopkins FBI Linux, provided by Strangerke
 		{