Merge branch 'master' into zvision

Conflicts:
	video/avi_decoder.cpp

8 files changed, 128 insertions, 26 deletions

diff --git a/devtools/create_mortdat/create_mortdat.cpp b/devtools/create_mortdat/create_mortdat.cpp
index f12a69bd37..5a491eea2f 100644
--- a/devtools/create_mortdat/create_mortdat.cpp
+++ b/devtools/create_mortdat/create_mortdat.cpp
@@ -204,16 +204,19 @@ void writeGameStrings() {
 /**
  * Write out the data for the English menu
  */
-void writeMenuBlock() {
-	// Write out a section header to the output file and the font data
+void writeMenuData(const char *menuData, int languageId) {
+	// Write out a section header to the output file and the menu data
 	const char menuHeader[4] = { 'M', 'E', 'N', 'U' };
 	outputFile.write(menuHeader, 4);				// Section Id
-	outputFile.writeWord(strlen(menuDataEn) / 8);	// Section size
+	int size = strlen(menuData) / 8 + 1; // Language code + Menu data size
+	outputFile.writeWord(size);
+
+	outputFile.writeByte(languageId);
 	// Write each 8-characters block as a byte (one bit per character)
 	// ' ' -> 0, anything else -> 1
 	byte value;
 	int valueCpt = 0;
-	const char* str = menuDataEn;
+	const char* str = menuData;
 	while (*str != 0) {
 		if (*(str++) != ' ')
 			value |= (1 << (7 - valueCpt));
@@ -226,10 +229,34 @@ void writeMenuBlock() {
 	}
 }
 
+void writeMenuBlock() {
+	writeMenuData(menuDataEn, 1);
+	writeMenuData(menuDataDe, 2);
+}
+
+void writeVerbNums(const int *verbs, int languageId) {
+	// Write out a section header to the output file
+	const char menuHeader[4] = { 'V', 'E', 'R', 'B' };
+	outputFile.write(menuHeader, 4);				// Section Id
+	int size = 52 + 1; // Language code + 26 words
+	outputFile.writeWord(size);
+
+	outputFile.writeByte(languageId);
+	for (int i = 0; i < 26; i++)
+		outputFile.writeWord(verbs[i]);
+}
+
+void writeMenuVerbs() {
+	writeVerbNums(verbsEn, 1);
+	writeVerbNums(verbsFr, 0);
+	writeVerbNums(verbsDe, 2);
+}
+
 void process() {
 	writeFontBlock();
 	writeGameStrings();
 	writeEngineStrings();
+	writeMenuVerbs();
 	writeMenuBlock();
 }
 
diff --git a/devtools/create_mortdat/create_mortdat.h b/devtools/create_mortdat/create_mortdat.h
index 8c210d32d9..e5007ae653 100644
--- a/devtools/create_mortdat/create_mortdat.h
+++ b/devtools/create_mortdat/create_mortdat.h
@@ -24,7 +24,7 @@
  */
 
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 0
+#define VERSION_MINOR 2
 
 enum AccessMode {
 	kFileReadMode = 1,
diff --git a/devtools/create_mortdat/gametext.h b/devtools/create_mortdat/gametext.h
index b1809c614c..4f7b1f9776 100644
--- a/devtools/create_mortdat/gametext.h
+++ b/devtools/create_mortdat/gametext.h
@@ -505,31 +505,31 @@ const char *gameDataEn[] =  {
 	"$",
 	"YOUR MOVE$",
 	" attach$",
-	" wait$",
-	" force$",
-	" sleep$",
-	" listen$",
-	" enter$",
 	" close$",
-	" search$",
-	" knock$",
-	" scratch$",
-	" read$",
 	" eat$",
-	" place$",
-	" open$",
-	" take$",
+	" enter$",
+	" force$",
+	" knock$",
+	" leave$",
+	" lift$",
+	" listen$",
 	" look$",
+	" open$",
+	" place$",
+	" read$",
+	" scratch$",
+	" search$",
+	" sleep$",
 	" smell$",
 	" sound$",
-	" leave$",
-	" lift$",
+	" take$",
 	" turn$",
+	" wait$",
 	" hide yourself$",
-	" search$",
-	" read$",
-	" put$",
 	" look$",
+	" put$",
+	" read$",
+	" search$",
 	" Leo$",
 	" Pat$",
 	" Guy$",
diff --git a/devtools/create_mortdat/menudata.h b/devtools/create_mortdat/menudata.h
index aa4557b336..ec8724135c 100644
--- a/devtools/create_mortdat/menudata.h
+++ b/devtools/create_mortdat/menudata.h
@@ -76,4 +76,68 @@ const char *menuDataEn =
 	"@@@     @@@  @@@  @@@   "
 	"                        ";
 
+const char *menuDataDe =
+	"   @@@       @@         "
+	"    @         @         "
+	"   @  @ @@   @      @@@@"
+	"   @   @  @  @@@   @   @"
+	"  @   @  @  @  @  @   @ "
+	"  @   @  @  @  @  @   @ "
+	"@@@ @@@ @@ @@  @@  @@@@ "
+	"                        "
+	"  @@@@@@   @        @@  "
+	"   @   @             @  "
+	"  @   @  @@   @@@@  @   "
+	"  @@@@    @  @   @  @@@ "
+	" @ @     @  @      @  @ "
+	" @  @    @  @   @  @  @ "
+	"@@  @@ @@@   @@@  @@  @@"
+	"                        "
+	"      @    @@      @    "
+	"    @@@     @      @    "
+	"    @ @    @  @@ @@@@   "
+	"   @  @    @ @    @     "
+	"  @@@@@   @@@    @      "
+	" @    @   @  @   @      "
+	"@@@ @@@ @@@ @@   @@     "
+	"                        "
+	"    @@@         @@      "
+	"     @           @      "
+	"    @    @@@@   @       "
+	"    @   @   @   @@@     "
+	"   @   @       @  @     "
+	"   @   @   @   @  @     "
+	" @@@    @@@   @@  @@    "
+	"                        "
+	"  @@@@@@                "
+	"   @   @        @@      "
+	"  @   @  @@@     @  @@@ "
+	"  @@@@  @   @ @@@@ @   @"
+	" @ @   @@@@@ @  @  @@@@ "
+	" @  @  @     @  @ @     "
+	"@@  @@ @@@   @@@  @@@   "
+	"                        "
+	"  @@@@@            @    "
+	"   @   @           @    "
+	"  @    @   @@@@  @@@@   "
+	"  @    @  @   @   @     "
+	" @    @  @   @   @      "
+	" @   @   @   @   @      "
+	"@@@@@     @@@@   @@     "
+	"                        ";
+
+const int verbsFr[26] = { 0x301, 0x302, 0x303, 0x304, 0x305, 0x306, 0x307, 0x308,
+						  0x309, 0x30a, 0x30b, 0x30c, 0x30d, 0x30e, 0x30f, 0x310,
+						  0x311, 0x312, 0x313, 0x314, 0x315, 0x401, 0x402, 0x403,
+						  0x404, 0x405 };
+
+const int verbsEn[26] = { 0x301, 0x315, 0x305, 0x310, 0x309, 0x304, 0x302, 0x30f,
+						  0x306, 0x30d, 0x30e, 0x303, 0x30c, 0x30b, 0x313, 0x30a,
+						  0x311, 0x312, 0x307, 0x308, 0x314, 0x401, 0x405, 0x404,
+						  0x403, 0x402 };
+
+const int verbsDe[26] = { 0x304, 0x314, 0x307, 0x310, 0x315, 0x308, 0x311, 0x306,
+						  0x30c, 0x301, 0x30d, 0x309, 0x312, 0x30f, 0x30e, 0x302,
+						  0x30a, 0x313, 0x303, 0x30b, 0x305, 0x405, 0x402, 0x404,
+						  0x403, 0x401 };
 #endif
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 23bf1bc28a..60aa35b739 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -405,7 +405,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b
 	if (isRelease) {
 		properties << "\t\t\t<IntrinsicFunctions>true</IntrinsicFunctions>\n"
 		              "\t\t\t<WholeProgramOptimization>true</WholeProgramOptimization>\n"
-		              "\t\t\t<PreprocessorDefinitions>WIN32;DISABLE_GUI_BUILTIN_THEME;RELEASE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n"
+		              "\t\t\t<PreprocessorDefinitions>WIN32;RELEASE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n"
 		              "\t\t\t<StringPooling>true</StringPooling>\n"
 		              "\t\t\t<BufferSecurityCheck>false</BufferSecurityCheck>\n"
 		              "\t\t\t<DebugInformationFormat></DebugInformationFormat>\n"
@@ -417,7 +417,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b
 		              "\t\t\t<SetChecksum>true</SetChecksum>\n";
 	} else {
 		properties << "\t\t\t<Optimization>Disabled</Optimization>\n"
-		              "\t\t\t<PreprocessorDefinitions>WIN32;DISABLE_GUI_BUILTIN_THEME;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n"
+		              "\t\t\t<PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n"
 		              "\t\t\t<MinimalRebuild>true</MinimalRebuild>\n"
 		              "\t\t\t<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\n"
 		              "\t\t\t<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\n"
diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index 17e378fd0f..23225d3435 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -286,7 +286,7 @@ void VisualStudioProvider::createBuildProp(const BuildSetup &setup, bool isRelea
 	if (isRelease) {
 		properties << "\t\tEnableIntrinsicFunctions=\"true\"\n"
 		              "\t\tWholeProgramOptimization=\"true\"\n"
-		              "\t\tPreprocessorDefinitions=\"WIN32;DISABLE_GUI_BUILTIN_THEME;RELEASE_BUILD\"\n"
+		              "\t\tPreprocessorDefinitions=\"WIN32;RELEASE_BUILD\"\n"
 		              "\t\tStringPooling=\"true\"\n"
 		              "\t\tBufferSecurityCheck=\"false\"\n"
 		              "\t\tDebugInformationFormat=\"0\"\n"
@@ -300,7 +300,7 @@ void VisualStudioProvider::createBuildProp(const BuildSetup &setup, bool isRelea
 		              "\t\tSetChecksum=\"true\"\n";
 	} else {
 		properties << "\t\tOptimization=\"0\"\n"
-		              "\t\tPreprocessorDefinitions=\"WIN32;DISABLE_GUI_BUILTIN_THEME\"\n"
+		              "\t\tPreprocessorDefinitions=\"WIN32\"\n"
 		              "\t\tMinimalRebuild=\"true\"\n"
 		              "\t\tBasicRuntimeChecks=\"3\"\n"
 		              "\t\tRuntimeLibrary=\"1\"\n"
diff --git a/devtools/credits.pl b/devtools/credits.pl
index 7d39730c63..45018a5633 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -638,6 +638,16 @@ begin_credits("Credits");
 				add_person("David Turner", "digitall", "");
 			end_section();
 
+			begin_section("Mortevielle");
+				add_person("Arnaud Boutonn&eacute;", "Strangerke", "");
+				add_person("Paul Gilbert", "dreammaster", "");
+			end_section();
+
+			begin_section("Neverhood");
+				add_person("Benjamin Haisch", "john_doe", "");
+				add_person("Filippos Karapetis", "[md5]", "");
+			end_section();
+
 			begin_section("Parallaction");
 				add_person("", "peres", "");
 			end_section();
diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 76c12f57f4..0dbcbf4792 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -775,6 +775,7 @@ puttzoo	Putt-Putt Saves the Zoo
 	3a3e592b074f595489f7f11e150c398d	-1	us	Windows	HE 99	Updated	-	Adrian
 	c5cc7cba02a2fbd539c4439e775b0536	43470	de	Windows	HE 99	Updated	-	Lightkey
 	5c9cecbd2952ccec14c9ecebf5822a34	-1	en	iOS	HE 100	-	-	clone2727
+	7b4ee071eecadc2d8cd0c3509110825c	-1	en	Windows	HE 100	Remastered	-	Kirben
 
 	3486ede0f904789267d4bcc5537a46d4	14337	en	Mac	-	Demo	-	khalek
 	d220d154aafbfa12bd6f3ab1b2dae420	-1	de	Mac	-	Demo	-	Joachim Eberhard