merge with trunk

svn-id: r42574

3 files changed, 41 insertions, 36 deletions

diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index a87a6eeaa6..ead0c232b1 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -507,14 +507,14 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
 			if (g->special == kFMTownsVersionE || g->special == kFMTownsVersionJ ||
 				g->special == k2TownsFile1E || g->special == k2TownsFile1J ||
 				g->special == k2TownsFile2E || g->special == k2TownsFile2J || fmtPatch == 5) {
-				// prevents creation of empty entries (which we have mostly between all strings in the fm-towns version)
+				// prevents creation of empty entries (which we have mostly between all strings in the FM-TOWNS version)
 				while (!data[++i]) {
 					if (i == size)
 						break;
 					targetsize--;
 				}
 				if (fmtPatch == 1) {
-					// Here is the first step of the extra treatment for all fm-towns string arrays that
+					// Here is the first step of the extra treatment for all FM-TOWNS string arrays that
 					// contain more than one string and which the original code
 					// addresses via stringname[boolJapanese].
 					// We simply skip every other string
@@ -593,7 +593,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
 			}
 
 			if (fmtPatch == 1) {
-				// Here is the extra treatment for all fm-towns string arrays that
+				// Here is the extra treatment for all FM-TOWNS string arrays that
 				// contain more than one string and which the original code
 				// addresses via stringname[boolJapanese].
 				// We simply skip every other string
@@ -637,7 +637,7 @@ bool extractStrings(PAKFile &out, const Game *g, const byte *data, const uint32
 }
 
 bool extractRooms(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) {
-	// different entry size for the fm-towns version
+	// different entry size for the FM-TOWNS version
 	const int roomEntrySize = (g->special == kFMTownsVersionE || g->special == kFMTownsVersionJ) ? (0x69) : ((g->special == kAmigaVersion) ? 0x52 : 0x51);
 	const int countRooms = size / roomEntrySize;
 
diff --git a/tools/credits.pl b/tools/credits.pl
index cfc328f070..3b297e961b 100755
--- a/tools/credits.pl
+++ b/tools/credits.pl
@@ -527,6 +527,11 @@ begin_credits("Credits");
 		  add_person("Paul Gilbert", "dreammaster", "");
 	  end_section();
 
+	  begin_section("Drascula");
+		  add_person("Filippos Karapetis", "[md5]", "");
+		  add_person("Paweł Kołodziejski", "aquadran", "");
+	  end_section();
+
 	  begin_section("FOTAQ");	# Flight of the Amazon Queen
 		  add_person("Gregory Montoir", "cyx", "");
 		  add_person("Joost Peters", "joostp", "");
@@ -832,7 +837,7 @@ begin_credits("Credits");
 		  add_person("Dobó Balázs", "draven", "Website design");
 		  add_person("Yaroslav Fedevych", "jafd", "HTML/CSS for the website");
 		  add_person("David Jensen", "Tyst", "SVG logo conversion");
-		  add_person("Jean Marc", "", "ScummVM logo");
+		  add_person("Jean Marc Gimenez", "", "ScummVM logo");
 		  add_person("", "Raina", "ScummVM forum buttons");
 	  end_persons();
 	end_section();
diff --git a/tools/scumm-md5.txt b/tools/scumm-md5.txt
index 4e57644b73..56b1334b3e 100644
--- a/tools/scumm-md5.txt
+++ b/tools/scumm-md5.txt
@@ -276,18 +276,18 @@ atlantis	Indiana Jones and the Fate of Atlantis
 	06b187468113f9ae5a400b148a847fac	12075	en	Mac	-	Floppy	six data files	Lars N sbye Christensen
 	d6dd0646404768a63e963891a96daadd	12035	en	Mac	-	Floppy	two data files	Fingolfin
 
-	182344899c2e2998fca0bebcd82aa81a	12035	en	DOS	-	CD	-	Fingolfin
-	1a6e5ae2777a6a33f06ffc0226210934	-1	en	Mac	-	CD	-	Scott Summers
-	2d9d46f23cb07bbc90b8ad464d3e4ff8	-1	en	Mac	-	CD	Mac bundle	Joachim Eberhard
-	8e9417564f33790815445b2136efa667	11915	jp	Mac	-	CD	-	Petr Maruska
+	182344899c2e2998fca0bebcd82aa81a	12035	en	DOS	CD	CD	-	Fingolfin
+	1a6e5ae2777a6a33f06ffc0226210934	-1	en	Mac	CD	CD	-	Scott Summers
+	2d9d46f23cb07bbc90b8ad464d3e4ff8	-1	en	Mac	CD	CD	Mac bundle	Joachim Eberhard
+	8e9417564f33790815445b2136efa667	11915	jp	Mac	CD	CD	-	Petr Maruska
 
-	c7be10f775404fd9785a8b92a06d240c	-1	en	FM-TOWNS	-	-	-	dhewg, Andrea Petrucci
-	4d34042713958b971cb139fba4658586	-1	jp	FM-TOWNS	-	-	-	Andrea Petrucci
+	c7be10f775404fd9785a8b92a06d240c	-1	en	FM-TOWNS	CD	-	-	dhewg, Andrea Petrucci
+	4d34042713958b971cb139fba4658586	-1	jp	FM-TOWNS	CD	-	-	Andrea Petrucci
 
 	035deab53b47bc43abc763560d0f8d4b	-1	en	DOS	-	Demo	-	
 	98744fe66ff730e8c2b3b1f58803ab0b	-1	en	DOS	-	Demo	-	Simon Krumrein, sev
-	99b6f822b0b2612415407865438697d6	-1	en	DOS	-	Demo	non-interactive	
-	28d24a33448fab6795850bc9f159a4a2	11170	jp	FM-TOWNS	-	Demo	non-interactive	khalek, Fingolfin
+	99b6f822b0b2612415407865438697d6	-1	en	DOS	CD	Demo	non-interactive	
+	28d24a33448fab6795850bc9f159a4a2	11170	jp	FM-TOWNS	CD	Demo	non-interactive	khalek, Fingolfin
 
 tentacle	Day of the Tentacle
 	acad97ab1c6fc2a5b2d98abf6db4a190	-1	en	All?	-	Floppy	Version A ?	
@@ -298,19 +298,19 @@ tentacle	Day of the Tentacle
 	50fcdc982a25063b78ad46bf389b8e8d	-1	it	DOS	-	Floppy	-	Andrea Petrucci
 	ae94f110a14ce71fc515d5b648827a8f	-1	es	DOS	-	Floppy	-	abnog, Andrea Petrucci
 
-	4167a92a1d46baa4f4127d918d561f88	7932	en	All?	-	CD	-	Fingolfin
-	8aa05d3cdb0e795436043f0546af2da2	-1	fr	All?	-	CD?	-	Andrea Petrucci
-	6e959d65358eedf9b68b81e304b97fa4	7932	de	All?	-	CD	-	Fingolfin
-	4fbbe9f64b8bc547503a379a301183ce	-1	it	All?	-	CD	-	Andrea Petrucci
-	883af4b0af4f77a92f1dcf1d0a283140	-1	es	All?	-	CD	-	Andrea Petrucci
-	cc04a076779379524ed4d9c5ee3c6fb1	282467632	en	Mac	-	CD	Mac bundle	Fingolfin, Joachim Eberhard
-	ede149fda3edfc1dbd7347e0737cb583	-1	fr	Mac	-	CD	Mac bundle	ThierryFR
-	f73883f13b5a302749a5bad31d909780	-1	de	Mac	-	CD	Mac bundle	morrissey
+	4167a92a1d46baa4f4127d918d561f88	7932	en	All?	CD	CD	-	Fingolfin
+	8aa05d3cdb0e795436043f0546af2da2	-1	fr	All?	CD	CD?	-	Andrea Petrucci
+	6e959d65358eedf9b68b81e304b97fa4	7932	de	All?	CD	CD	-	Fingolfin
+	4fbbe9f64b8bc547503a379a301183ce	-1	it	All?	CD	CD	-	Andrea Petrucci
+	883af4b0af4f77a92f1dcf1d0a283140	-1	es	All?	CD	CD	-	Andrea Petrucci
+	cc04a076779379524ed4d9c5ee3c6fb1	282467632	en	Mac	CD	CD	Mac bundle	Fingolfin, Joachim Eberhard
+	ede149fda3edfc1dbd7347e0737cb583	-1	fr	Mac	CD	CD	Mac bundle	ThierryFR
+	f73883f13b5a302749a5bad31d909780	-1	de	Mac	CD	CD	Mac bundle	morrissey
 
-	c83079157ec765a28de445aec9768d60	7477	en	All	-	Demo	-	Fingolfin
-	17fa250eb72dae2dad511ba79c0b6b0a	-1	fr	DOS	-	Demo	-	cyx
-	ac1642b6edfb8521ca03760126f1c250	-1	de	DOS	-	Demo	-	Simon Krumrein, sev
-	2a41b53cf1a90b6e6f26c10cc6041084	2439158	en	Mac	-	Demo	Mac bundle	Fingolfin
+	c83079157ec765a28de445aec9768d60	7477	en	All	CD	Demo	-	Fingolfin
+	17fa250eb72dae2dad511ba79c0b6b0a	-1	fr	DOS	CD	Demo	-	cyx
+	ac1642b6edfb8521ca03760126f1c250	-1	de	DOS	CD	Demo	-	Simon Krumrein, sev
+	2a41b53cf1a90b6e6f26c10cc6041084	2439158	en	Mac	CD	Demo	Mac bundle	Fingolfin
 
 samnmax	Sam & Max Hit the Road
 	3b301b7892f883ce42ab4be6a274fea6	-1	en	DOS	-	Floppy	-	Andrea Petrucci
@@ -320,21 +320,21 @@ samnmax	Sam & Max Hit the Road
 	b289a2a8cbedbf45786e0b4ad2f510f1	-1	it	DOS	-	Floppy	-	Andrea Petrucci
 	fc53ce0e5f6562b1c1e1b4b8203acafb	-1	es	DOS	-	Floppy	-	Andrea Petrucci
 
-	d917f311a448e3cc7239c31bddb00dd2	9080	en	All?	-	CD	-	Fingolfin
-	7edd665bbede7ea8b7233f8e650be6f8	-1	fr	All?	-	CD	-	Andrea Petrucci
-	0fb73eddfcf584c02ba097984df131ba	9080	de	All?	-	CD	-	Fingolfin
-	0f6f2e716ba896a44e5059bba1de7ca9	-1	it	All?	-	CD	-	Andrea Petrucci
-	4ba7fb331296c283e73d8f5b2096e551	-1	es	All?	-	CD	-	Andrea Petrucci
-	d43352a805d78b5f4936c6d7779bf575	-1	ru	DOS	-	CD	-	
-	166553538ff320c69edafeee29525419	-1	en	Mac	-	CD	Mac bundle	Joachim Eberhard
-	3a5d13675e9a23aedac0bac7730f0ac1	-1	fr	Mac	-	CD	Mac bundle	ThierryFR
+	d917f311a448e3cc7239c31bddb00dd2	9080	en	All?	CD	CD	-	Fingolfin
+	7edd665bbede7ea8b7233f8e650be6f8	-1	fr	All?	CD	CD	-	Andrea Petrucci
+	0fb73eddfcf584c02ba097984df131ba	9080	de	All?	CD	CD	-	Fingolfin
+	0f6f2e716ba896a44e5059bba1de7ca9	-1	it	All?	CD	CD	-	Andrea Petrucci
+	4ba7fb331296c283e73d8f5b2096e551	-1	es	All?	CD	CD	-	Andrea Petrucci
+	d43352a805d78b5f4936c6d7779bf575	-1	ru	DOS	CD	CD	-	
+	166553538ff320c69edafeee29525419	-1	en	Mac	CD	CD	Mac bundle	Joachim Eberhard
+	3a5d13675e9a23aedac0bac7730f0ac1	-1	fr	Mac	CD	CD	Mac bundle	ThierryFR
 
 	c3196c5349e53e387aaff1533d95e53a	-1	en	DOS	-	Demo	-	
 	0e4c5d54a0ad4b26132e78b5ea76642a	6485	en	DOS	-	Demo	WIP	Fingolfin
-	d9d0dd93d16ab4dec55cabc2b86bbd17	6478	en	DOS	-	Demo	non-interactive	Fingolfin
+	d9d0dd93d16ab4dec55cabc2b86bbd17	6478	en	DOS	CD	Demo	non-interactive	Fingolfin
 	cc8ba2b0df2f9c450bcf055fe2711979	7485	de	DOS	-	Demo	-	Simon Krumrein, sev, Fingolfin
-	0425954a9db5c340861672892c3e678d	-1	en	All	-	Demo	-	Kirben
-	6dead580b0ff14d5f7b33b4219f04159	16556335	en	Mac	-	Demo	Mac bundle	Fingolfin
+	0425954a9db5c340861672892c3e678d	-1	en	All	CD	Demo	-	Kirben
+	6dead580b0ff14d5f7b33b4219f04159	16556335	en	Mac	CD	Demo	Mac bundle	Fingolfin
 
 ft	Full Throttle
 	41958e24d03181ff9a381a66d048a581	-1	br	All?	-	-	-	Danilo E.S.