[Scummvm-cvs-logs] scummvm master -> 3540cf189df459ff17ef406e2d91eb7977063ac8

[m-kiewitz]

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:
445b690a6f SCI: Add detection for the ImagiNation Network (INN) Demo
3540cf189d Merge pull request #781 from OmerMor/inndemo


Commit: 445b690a6fa533e69de53ca37cbd4b2b57a4b059
    https://github.com/scummvm/scummvm/commit/445b690a6fa533e69de53ca37cbd4b2b57a4b059
Author: Omer Mor (omer.mor at gmail.com)
Date: 2016-07-06T00:40:33+03:00

Commit Message:
SCI: Add detection for the ImagiNation Network (INN) Demo

Changed paths:
    engines/sci/detection.cpp
    engines/sci/detection_tables.h
    engines/sci/sci.h



diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index c920ef1..6b945d6 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -89,6 +89,7 @@ static const PlainGameDescriptor s_sciGameTitles[] = {
 	{"ecoquest2",       "EcoQuest II: Lost Secret of the Rainforest"},
 	{"freddypharkas",   "Freddy Pharkas: Frontier Pharmacist"},
 	{"hoyle4",          "Hoyle Classic Card Games"},
+	{"inndemo",         "ImagiNation Network (INN) Demo"},
 	{"kq6",             "King's Quest VI: Heir Today, Gone Tomorrow"},
 	{"laurabow2",       "Laura Bow 2: The Dagger of Amon Ra"},
 	{"qfg1vga",         "Quest for Glory I: So You Want to Be a Hero"},	// Note: There was also a SCI0 version of this (further up)
@@ -157,6 +158,7 @@ static const GameIdStrToEnum s_gameIdStrToEnum[] = {
 	{ "hoyle3",          GID_HOYLE3 },
 	{ "hoyle4",          GID_HOYLE4 },
 	{ "iceman",          GID_ICEMAN },
+	{ "inndemo",         GID_INNDEMO },
 	{ "islandbrain",     GID_ISLANDBRAIN },
 	{ "jones",           GID_JONES },
 	{ "kq1sci",          GID_KQ1 },
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 0b69aa9..54e8abe 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1110,6 +1110,14 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
+	// ImagiNation Network (INN) Demo
+	// SCI interpreter version 1.001.097
+	{"inndemo", "", {
+		{"resource.000", 0, "535b1b920441ec73f42eaa4ccfd47b89", 514578},
+		{"resource.map", 0, "333daf27c3e8a6d274a3e0061ed7cd5c", 1545},
+		AD_LISTEND},
+		Common::EN_ANY, Common::kPlatformDOS, 0, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
+
 	// Jones in the Fast Lane EGA - English DOS
 	// SCI interpreter version 1.000.172 (not 100% sure FIXME)
 	{"jones", "EGA", {
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 956187c..3216fa1 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -139,6 +139,7 @@ enum SciGameId {
 	GID_HOYLE3,
 	GID_HOYLE4,
 	GID_ICEMAN,
+	GID_INNDEMO,
 	GID_ISLANDBRAIN,
 	GID_JONES,
 	GID_KQ1,


Commit: 3540cf189df459ff17ef406e2d91eb7977063ac8
    https://github.com/scummvm/scummvm/commit/3540cf189df459ff17ef406e2d91eb7977063ac8
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-07-06T00:00:22+02:00

Commit Message:
Merge pull request #781 from OmerMor/inndemo

SCI: Add detection for the ImagiNation Network (INN) Demo

Changed paths:
    engines/sci/detection.cpp
    engines/sci/detection_tables.h
    engines/sci/sci.h