[Scummvm-git-logs] scummvm master -> e8d27c782efa69bc5763c7cb75d7eebd832e581f

sev- sev at scummvm.org
Tue Aug 15 22:25:06 CEST 2017


This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0f0dd88b61 GRAPHICS: MACGUI: Fix MacText::getTextChunk() for multiline selections
b9a7f2c800 GRAPHICS: MACGUI: Fix crash in selection when there is no text found
df7bd3033e GRAPHICS: MACGUI: Syncronise internal state when selection is cut
7313de59b6 WAGE: Use new MacTextWindow API for selection cut/clear
16739d386e WAGE: Increased md5 sum size to 2MB and recalculated all checksums
e8d27c782e WAGE: Sorted all detection entries to dictionary sort


Commit: 0f0dd88b6129151595d58541ba6f35ce7db8922c
    https://github.com/scummvm/scummvm/commit/0f0dd88b6129151595d58541ba6f35ce7db8922c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-15T19:48:16+02:00

Commit Message:
GRAPHICS: MACGUI: Fix MacText::getTextChunk() for multiline selections

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 8168962..e2b945d 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -544,6 +544,10 @@ Common::String MacText::getTextChunk(int startRow, int startCol, int endRow, int
 
 				startCol -= _textLines[i].chunks[chunk].text.size();
 			}
+			if (newlines)
+				res += '\n';
+			else
+				res += ' ';
 		} else if (i == endRow) {
 			for (uint chunk = 0; chunk < _textLines[i].chunks.size(); chunk++) {
 				if (formatted)
@@ -569,6 +573,8 @@ Common::String MacText::getTextChunk(int startRow, int startCol, int endRow, int
 
 			if (newlines)
 				res += '\n';
+			else
+				res += ' ';
 		}
 	}
 


Commit: b9a7f2c8004073871a698385fcf364639df02919
    https://github.com/scummvm/scummvm/commit/b9a7f2c8004073871a698385fcf364639df02919
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-15T19:49:15+02:00

Commit Message:
GRAPHICS: MACGUI: Fix crash in selection when there is no text found

Changed paths:
    graphics/macgui/mactextwindow.cpp


diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index a45d1d6..9a1898b 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -257,9 +257,12 @@ Common::String MacTextWindow::cutSelection() {
 
 	const char *selStart = strstr(_inputText.c_str(), selection.c_str());
 
-	if (!selStart)
+	if (!selStart) {
 		warning("Cannot find substring '%s' in '%s'", selection.c_str(), _inputText.c_str());
 
+		return Common::String("");
+	}
+
 	int selPos = selStart - _inputText.c_str();
 
 	_inputText = Common::String(_inputText.c_str(), selPos) + Common::String(_inputText.c_str() + selPos + selection.size());


Commit: df7bd3033e49672abe11f53318ba30a01ff85252
    https://github.com/scummvm/scummvm/commit/df7bd3033e49672abe11f53318ba30a01ff85252
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-15T19:50:07+02:00

Commit Message:
GRAPHICS: MACGUI: Syncronise internal state when selection is cut

Changed paths:
    graphics/macgui/mactextwindow.cpp


diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index 9a1898b..9bbf2c8 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -264,8 +264,11 @@ Common::String MacTextWindow::cutSelection() {
 	}
 
 	int selPos = selStart - _inputText.c_str();
+	Common::String newInput = Common::String(_inputText.c_str(), selPos) + Common::String(_inputText.c_str() + selPos + selection.size());
 
-	_inputText = Common::String(_inputText.c_str(), selPos) + Common::String(_inputText.c_str() + selPos + selection.size());
+	clearSelection();
+	clearInput();
+	appendInput(newInput);
 
 	return selection;
 }


Commit: 7313de59b6df6f2f06d4be9b1833ba19b0e43f85
    https://github.com/scummvm/scummvm/commit/7313de59b6df6f2f06d4be9b1833ba19b0e43f85
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-15T19:51:33+02:00

Commit Message:
WAGE: Use new MacTextWindow API for selection cut/clear

This enables multiline selection cutting and clearing.

Changed paths:
    engines/wage/gui.cpp


diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 3159d80..53f83bb 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -357,60 +357,30 @@ void Gui::actionUndo() {
 }
 
 void Gui::actionClear() {
-	const Graphics::SelectedText *s = _consoleWindow->getSelectedText();
-
-	if (s->endY == -1)
+	if (_consoleWindow->getSelectedText()->endY == -1)
 		return;
 
-	int startPos = s->startCol;
-	int endPos = s->endCol;
-
-	if (startPos > endPos)
-		SWAP(startPos, endPos);
-
 	Common::String input = _consoleWindow->getInput();
 
-	Common::String beg(input.c_str(), &input.c_str()[startPos]);
-	Common::String end(&input.c_str()[endPos]);
+	_consoleWindow->cutSelection();
 
 	_undobuffer = input;
 
-	_consoleWindow->clearInput();
-	_consoleWindow->appendInput(beg + end);
-
 	_menu->enableCommand(kMenuEdit, kMenuActionUndo, true);
-
-	_consoleWindow->clearSelection();
 }
 
 void Gui::actionCut() {
-	const Graphics::SelectedText *s = _consoleWindow->getSelectedText();
-
-	if (s->endY == -1)
+	if (_consoleWindow->getSelectedText()->endY == -1)
 		return;
 
-	int startPos = s->startCol;
-	int endPos = s->endCol;
-
-	if (s->startRow > s->endRow || (s->startRow == s->endRow && startPos > endPos))
-		SWAP(startPos, endPos);
-
 	Common::String input = _consoleWindow->getInput();
 
-	Common::String beg(input.c_str(), &input.c_str()[startPos]);
-	Common::String mid(&input.c_str()[startPos], &input.c_str()[endPos]);
-	Common::String end(&input.c_str()[endPos]);
+	_clipboard = _consoleWindow->cutSelection();
 
 	_undobuffer = input;
 
-	_consoleWindow->clearInput();
-	_consoleWindow->appendInput(beg + end);
-	_clipboard = mid;
-
 	_menu->enableCommand(kMenuEdit, kMenuActionUndo, true);
 	_menu->enableCommand(kMenuEdit, kMenuActionPaste, true);
-
-	_consoleWindow->clearSelection();
 }
 
 void Gui::disableUndo() {


Commit: 16739d386e8b7b31a32709a4c62d3b5d67270b54
    https://github.com/scummvm/scummvm/commit/16739d386e8b7b31a32709a4c62d3b5d67270b54
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-15T21:16:05+01:00

Commit Message:
WAGE: Increased md5 sum size to 2MB and recalculated all checksums

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


diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index 65c1419..6f09fc7 100644
--- a/engines/wage/detection.cpp
+++ b/engines/wage/detection.cpp
@@ -54,7 +54,7 @@ static const PlainGameDescriptor wageGames[] = {
 class WageMetaEngine : public AdvancedMetaEngine {
 public:
 	WageMetaEngine() : AdvancedMetaEngine(Wage::gameDescriptions, sizeof(ADGameDescription), wageGames) {
-		_md5Bytes = 50000;
+		_md5Bytes = 2 * 1024 * 1024;
 		_singleId = "wage";
 		_guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI);
 	}
diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 62e4a9b..07a1345 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -32,146 +32,147 @@ namespace Wage {
 #define BIGGAME(t,v,f,m,s) { t,v,AD_ENTRY1s(f,m,s),Common::EN_ANY,Common::kPlatformMacintosh,ADGF_DEFAULT,GUIO0()}
 
 static const ADGameDescription gameDescriptions[] = {
-	FANGAME("3rd Floor", "3ed49d2163e46d2c9b33fd80927d9e22", 281409),
-	FANGAME("3rd Floor", "3ed49d2163e46d2c9b33fd80927d9e22", 281423), // alt version
-	BIGGAME("afm", "v1.8", "Another Fine Mess 1.8", "abc7188469a9a7083fd4caec55a4f76e", 1420723),
-	BIGGAME("amot", "v1.8", "A Mess O' Trouble 1.8", "6b59e5bb9a4b74ecdd9f66d4e36a59cf", 1843104),
+	FANGAME("3rd Floor", "931aa0b6ada3aced5117ee6e6daf2fb8", 281409),
+	FANGAME("3rd Floor", "140883954b7cd89b0ffabde6ee0073d4", 281423), // alt version
+	BIGGAME("afm", "v1.8", "Another Fine Mess 1.8", "8bbec64ffe9deee4ff48d27f01176814", 1420723),
+	BIGGAME("amot", "v1.8", "A Mess O' Trouble 1.8", "57de8f1f79a24fa1a296aa10242c3648", 1843104),
 	// Crash on third screen
-	FANGAME("Brownie's Dream", "6fdcce532bcd50b7e4f3f6bab50a0ee6", 440704),
-	FANGAMEN("Brownie's Time Travels", "Brownie's Time Travels v1.2", "55842a100b56e236c5ad69563e01fc24", 471589),
-	FANGAME("Bug Hunt", "738e2e8a1020be48c5ef42da571674ae", 195699),
-	FANGAME("Bug Hunt", "118a41121143488719d28daa9af8cd39", 195779), // alt version
-	BIGGAME("cantitoe", "", "Camp Cantitoe", "1780c41d14b876461a19dbeceebf2a37", 616985),
-	FANGAME("Canal District", "34e7a8e84b33ba8ea38b4ffd76ef074f", 641470),
-	FANGAME("Carbon Copy", "9e781acd63290ae390d515cffc742011", 519445),
+	FANGAME("Brownie's Dream", "379f2c810efc18bad932049d331df1b6", 440704),
+	FANGAMEN("Brownie's Time Travels", "Brownie's Time Travels v1.2", "d95999aff4e283bd21db686cfb2cb9b9", 471589),
+	FANGAME("Bug Hunt", "b55b23a5f38d28407bd6c178a64ab629", 195699),
+	FANGAME("Bug Hunt", "cd7e1064813b9b0e3cd946e569109b34", 195779), // alt version
+	BIGGAME("cantitoe", "", "Camp Cantitoe", "4a44860fdfe5b9e98bcf8433801cd925", 616985),
+	FANGAME("Canal District", "061a09e9258145f6a585e869a0319004", 641470),
+	FANGAME("Carbon Copy", "322410318c60045928a10f6b4c0b0a87", 519445),
 	// Invalid rect in scene "FINALE"
-	FANGAME("Castle of Ert", "a45b439bb3a9c8a4a14b996024222068", 198955),
-	FANGAMEN("Castle of Ert", "Castle of Ert.1", "a45b439bb3a9c8a4a14b996024222068", 198983), // alt version
-	FANGAMEND("Death Mall", "Death Mall Demo", "1c78fc15fb037b242a0bc6bac7d4d889", 254874),
-	FANGAME("Deep Angst", "7f8821f7b279269a91f9aadfed98eec0", 329550), // Original gile name "Deep Angst™"
-	FANGAME("Deep Ennui", "7fa4368834a22a9d4b7246a6297b455f", 86075),
+	FANGAME("Castle of Ert", "069daab46729291a615e9ee3528008ff", 198955),
+	FANGAMEN("Castle of Ert", "Castle of Ert.1", "ecadcdd9bdee68aeb32507932857db30", 198983), // alt version
+	FANGAMEND("Death Mall", "Death Mall Demo", "8284351df1c7b678279139ed486ab127", 254874),
+	FANGAME("Deep Angst", "ddc4c8b3d317e2c79a12c53275253ac3", 329550), // Original gile name "Deep Angst™"
+	FANGAME("Deep Ennui", "9879bf659f11c9177d578a347da0c658", 86075),
 	// Polygons with ignored byte 1
-	FANGAME("Double Trouble", "3f0c032377d87704267283380800633a", 542371),
-	BIGGAME("drakmythcastle", "disk I", "Drakmyth Castle disk I of II", "5b1fd760fbc081c608acebfe1d07a58a", 793784),
-	BIGGAME("drakmythcastle", "disk II", "Drakmyth Castle II", "1116f9c2c781f79e1f9c868b51ae7fa5", 1685659),
+	FANGAME("Double Trouble", "1cd05d66163b44f9f0d8c3e7232bc2db", 542371),
+	BIGGAME("drakmythcastle", "disk I", "Drakmyth Castle disk I of II", "54dd0a817b667fc05c4f2dee6abe126a", 793784),
+	BIGGAME("drakmythcastle", "disk II", "Drakmyth Castle II", "b57af17c805775d7d68b62133164c4e4", 1685659),
 	// Crash at start in GUI rendering
-	FANGAME("Dune Eternity", "6b29f82e235815ffc4c9f30dc09968dd", 290201), // Original file name is "***DUNE ETERNITY*** "
-	FANGAMEN("Dungeon World II", "DungeonWorld2", "753df07166ca48e303d782cc72dd4053", 230199),
+	FANGAME("Dune Eternity", "4946bc99cc42bf83b628352aa9b81a7b", 290201), // Original file name is "***DUNE ETERNITY*** "
+	FANGAMEN("Dungeon World II", "DungeonWorld2", "74a7153f9ae61a59a216078a37f68f2c", 230199),
 	// Made for bigger resolution
-	FANGAME("Dynasty of Dar", "b2e9a5cca28acb85617b1477a5fca3e2", 275693),
-	FANGAME("Edg's World", "0a3a3aaa36088c514b668f1f62120006", 106769),
-	FANGAME("Eidisi I", "3d778c0fe7addf5f29e7593ba0fd3953", 172552),
-	FANGAME("Eidisi I", "8c2fb325a49344568c5536bba36a2556", 172566), // alt version
+	FANGAME("Dynasty of Dar", "e118a261d33831c224f3b776ec5dd2a8", 275693),
+	FANGAME("Edg's World", "480bcf68be49ee3765902e922ccdc833", 106769),
+	FANGAME("Eidisi I", "ed8fec61ad94ddec06feaf4eb720084b", 172552),
+	FANGAME("Eidisi I", "06ae31c4361f9bd5b91593858b6d0d79", 172566), // alt version
 	// Problems(?) with text on the first screen
-	FANGAMEN("Enchanted Pencils", "Enchanted Pencils 0.99 (PG)", "9a9777a83e58bebfa6f1662d5e236384", 408913),
-	FANGAME("Escape!", "3ada261c2d1d9ce6b9da068237472689", 65075), // Original file name "Escape!†"
+	FANGAMEN("Enchanted Pencils", "Enchanted Pencils 0.99 (PG)", "49a0708da81dbeb28c6e607429c92209", 408913),
+	FANGAME("Escape!", "28a9658ee846a34f133df29b54cf255a", 65075), // Original file name "Escape!†"
 	FANGAME("Escape from School!", "2055747bb874052333190eb993246a7f", 50105),
 	FANGAME("Escape from School!", "fcc581e52d1fc8ea4603d7c953fa935a", 50119), // Original file name "Escape from School!†"
-	FANGAME("Everyman 1", "e20cebf0091a1b1bf023aac6f28c9011", 335705),
-	FANGAME("Exploration Zeta!", "6127d9c04ad68f0cbb5f6aa1d95b48a2", 366599),
+	FANGAME("Everyman 1", "97d78e22493245636f84ad8db732305c", 335705),
+	FANGAME("Exploration Zeta!", "9006eff549afadc956e5de4ae6a24fbd", 366599),
 	// Cannot proceed past the first scene
-	FANGAMEND("Explorer", "Explorer DEMO", "a9ebdecf6c8de95a03e593d877dacc13", 461228),
+	FANGAMEND("Explorer", "Explorer DEMO", "0ae79f48754466c4cd65137c7f186384", 461228),
 	// Crash in console rendering on the first scene
-	FANGAME("Fantasy Quest", "b42b0e86e2c84464283640c74b25e015", 762754),
-	FANGAME("Find the Heart", "aa244c15f2ba8cef468714be34223acd", 106235), // From Joshua's Worlds 1.0
-	FANGAME("Find the Heart", "a6834cb230cea1953f5bf1f8f7aacabd", 105885), // From Joshua's Worlds. Alt version
-	FANGAME("Find the Heart", "a6834cb230cea1953f5bf1f8f7aacabd", 105871), // Standalone
-	FANGAMEN("Fortune Teller", "Fortune Teller 1.1", "7d2628eeea67b33379e01c0aef8dd196", 73931),
-	FANGAMEN("Haunted House", "Haunted House 1.5", "5db2f95c7abaa9d060b94271a5bc57f8", 177500),
+	FANGAME("Fantasy Quest", "b52d3e2680a76c23b2791e2c87f6b6bd", 762754),
+	FANGAME("Find the Heart", "0c0c282649597ea1ac82d97c8d4029a2", 106235), // From Joshua's Worlds 1.0
+	FANGAME("Find the Heart", "08de3248b8c691d9a08af984bdcfa872", 105885), // From Joshua's Worlds. Alt version
+	FANGAME("Find the Heart", "73935d313b666763e50d2cdc6b3b7908", 105871), // Standalone
+	FANGAMEN("Fortune Teller", "Fortune Teller 1.1", "3c09329fc3c92a70e5c8874cc763f5cb", 73931),
+	FANGAMEN("Haunted House", "Haunted House 1.5", "5e34e9fa13f4c90876f10a40ea1d1c79", 177500),
 	// Cropped graphics on first scene, cannot pass to in-game
-	FANGAME("Intro to Gothic", "6f732eaad6e3b85795f8ee6c6a40d837", 208067),
-	FANGAMEN("James Bond 007", "007", "885c2b6b79c81bd230732431e04a8231", 50663),
+	FANGAME("Intro to Gothic", "606eec666f0b2d767e4423747e740434", 208067),
+	FANGAMEN("James Bond 007", "007", "2449924f2cb43454489a4ef91c0ee702", 50663),
 	// Lots of unhandled comparisons
-	FANGAME("Jamie the Demon Slayer", "fa0ca9618c18425b6d9bf913f762d91b", 232789),
-	FANGAMEN("Journey", "The Journey 1.6.2 US", "e66f37472e1414a088eb5d5acc4df794", 820572),
-	FANGAMEN("Jumble", "LSJUMBLE", "7c46851d2f90c7da9efe40b1688869c2", 647339), // Original file name is "LSJUMBLE† "
-	FANGAME("Karth of the Jungle", "5f2346834821dc3c4008e139cd37b3cb", 96711),
-	FANGAME("Karth of the Jungle", "444f9426f342135fbcc32180e5ba5b1c", 96960), // Alternative version
-	FANGAME("Karth of the Jungle II", "32161b27de894fd9e3f054afc4013f34", 201053),
-	FANGAMEN("Little Pythagoras", "Little Pythagoras 1.1.1", "75906fa955de695ac3e8164e7d88ac7b", 628821),
-	FANGAME("Lost Crystal", "d5e27a83f2884a24c6ec26c6cb776fe9", 771072),
-	FANGAMEN("Lost In Kookyville", "Lost In Kookyville 1.2.4", "5ab6259706b33230dbfba05618c2c5c9", 721569),
-	FANGAME("Magic Rings", "450e986694b96f3b9e6cc64e57b753dc", 109044),
+	FANGAME("Jamie the Demon Slayer", "ed054aa760569059c7ea554e822089a6", 232789),
+	FANGAMEN("Journey", "The Journey 1.6.2 US", "588a516caa187005fdfcbc72823c8eff", 820572),
+	FANGAMEN("Jumble", "LSJUMBLE", "555ead186ec1683157e53b96fc4a99d5", 647339), // Original file name is "LSJUMBLE† "
+	FANGAME("Karth of the Jungle", "6dae6eef6f46101ba8c9e312bb82e824", 96711),
+	FANGAME("Karth of the Jungle", "c869cacc59f2402d06bc8197be28b5df", 96960), // Alternative version
+	FANGAME("Karth of the Jungle II", "6f26e0bace5c41d91c135e5e102de5bc", 201053),
+	FANGAMEN("Little Pythagoras", "Little Pythagoras 1.1.1", "66a5d2ac1a0df2ee84cbee583c1f1dfe", 628821),
+	FANGAME("Lost Crystal", "945a1cf1ead6dd298305935b5ccb21d2", 771072),
+	FANGAMEN("Lost In Kookyville", "Lost In Kookyville 1.2.4", "89ecb4cef5cc4036e54f8bc45ce7520e", 721569),
+	FANGAME("Magic Rings", "263e2c90af61f0798bf41f6a1e3f6345", 109044),
 	// No way to click on the house
-	FANGAME("Messy House", "705df61da9e7d742b7ad678e59eb7bfb", 177120),
-	FANGAME("Midnight Snack", "76986389f9a08dd95450c8b9cf408653", 67952),
-	FANGAME("Midnight Snack", "76986389f9a08dd95450c8b9cf408653", 67966), // Alt version
-	FANGAME("Mike's House", "3d23c2b88cefd958bcbc4d4c711003d8", 87357),
-	FANGAME("Minitorian", "15fbb2bd75d83155ed21edbc5dc9558f", 586464),
-	FANGAME("M'Lord's Warrior", "0bebb2c62529c89590f6c5be6e1e9838", 465639), // Original file name is "M'Lord's Warrior †"
-	FANGAMEN("Mormonoids from the Deep", "Mormonoids 1.25", "5030e22210720d8f8169f5b242183214", 645318),
+	FANGAME("Messy House", "32ca71f2ff37997407cead590c2dd306", 177120),
+	FANGAME("Midnight Snack", "70ba8a5a1f0304669c9987360bba236f", 67952),
+	FANGAME("Midnight Snack", "24973af10822979e23866d88a7d2e15c", 67966), // Alt version
+	FANGAME("Mike's House", "591b5a4d52ecf9a7d87256e83b78b0fd", 87357),
+	FANGAME("Minitorian", "c728dfccdca12571e275a4113b3db343", 586464),
+	FANGAME("M'Lord's Warrior", "e0a0622ce2023984e3118141a9688ec5", 465639), // Original file name is "M'Lord's Warrior †"
+	FANGAMEN("Mormonoids from the Deep", "Mormonoids 1.25", "4730d0c47d13401d73353e980f91a304", 645318),
 	// Unhandled comparison case
-	FANGAME("Mountain of Mayhem", "4088fc534042081b7ab7b49675ab4a6e", 750003), // Original file name "Mountain of Mayhem †"
+	FANGAME("Mountain of Mayhem", "634211b004371635d191ae0687035501", 750003), // Original file name "Mountain of Mayhem †"
 	// No way to pass through the first screen
-	FANGAME("Nightcrawler Ned", "0cf27bf82de299c69405f7910146bf00", 366542),
+	FANGAME("Nightcrawler Ned", "8423fc015c395bd6be54a7ea69170d99", 366542),
 	// Crash on startup
-	FANGAMEN("Parrot Talk", "PARROT TALK V1", "b1570b0779891d5d50a3cf0146d28202", 118936),
+	FANGAMEN("Parrot Talk", "PARROT TALK V1", "c38c090be8c078d931905c93bc0689f5", 118936),
 	// Crash on startup
-	FANGAMEN("Parrot Talk", "PARROT TALKV2", "0c1e920ed3ff74b8f22eaaf0d3496d5a", 118884),
-	FANGAME("Pavilion", "3a33149569325a44d98544452323c819", 231687),
-	FANGAMEN("Pencils", "Pencils.99", "9c200938488565080e12989e784586e2", 408551),
+	FANGAMEN("Parrot Talk", "PARROT TALKV2", "5ec1df9e2d6d0dcf1a040a95500d9551", 118884),
+	FANGAME("Pavilion", "a980e60a291c0a7b949474177affa134", 231687),
+	FANGAMEN("Pencils", "Pencils.99", "09dbcdbefe20536c2db1b1a4fb4e5ed3", 408551),
 	// Polygons with byte 1
-	FANGAME("Periapt", "fb4052819126b88d7e03ebc00c669a9d", 406006),
-	FANGAME("Psychotic!", "6b4ae6261b405e2feac58c5a2ddb67c5", 247693),
-	FANGAME("Puzzle Piece Search", "6b4ae6261b405e2feac58c5a2ddb67c5", 247693), // From Joshua's Worlds 1.0
-	FANGAME("The Puzzle Piece Search", "fb99797c429c18ec68418fdd12af17a1", 247338), // From Joshua's Worlds
-	FANGAME("The Puzzle Piece Search", "fb99797c429c18ec68418fdd12af17a1", 247324), // Stnadalone
+	FANGAME("Periapt", "7e26a7827c694232624321a5a6844511", 406006),
+	FANGAME("Psychotic!", "d6229615b71b189f6ef71399a0856cd2", 247693),
+	FANGAME("Puzzle Piece Search", "6c21c1e0c6afef9300941abd7782dd16", 247693), // From Joshua's Worlds 1.0
+	FANGAME("The Puzzle Piece Search", "8fa1d80dd3f1ed69f45d15d774968995", 247338), // From Joshua's Worlds
+	FANGAME("The Puzzle Piece Search", "fb839ac4f22427f44e99bcc5afd57a0b", 247324), // Stnadalone
 	// Empty(?)  first scene
-	FANGAME("Pyramid of No Return", "38383ac85cc16703f13f8d82f1398123", 385145),
+	FANGAME("Pyramid of No Return", "4bf4c39b140f5aadb5f8c9a50153d18e", 385145),
 	// Cropped graphics at the first scene
-	FANGAME("Psychotic!", "29b30e6aae9cc6db5eccb09f695ff25e", 367309),
-	FANGAME("P-W Adventure", "9bf86fb946683500d23887ef185726ab", 219216),
-	FANGAMEN("Pyramid of Ert", "Pyramid of Ert V1.2", "fb931cd35440a66864a434c773b496da", 315783),
-	FANGAME("Queen Quest", "8273e29afe64a984eb0ce7b43fdf3a59", 57039), // alt version
-	FANGAME("Quest for T-Rex", "f16f2cd525c9aeb4733295d8d842b902", 592584),
-	FANGAME("Quest for the Dark Sword", "4815d9a770904b26c463b7e4fcd121c7", 572576),
-	FANGAME("Radical Castle", "09b70763c7a48a76240bd0e42737caaa", 355601),
-	FANGAME("Radical Castle 1.0", "8ae2e29ffeca52a5c7fae66dec4764a3", 347278),
-	BIGGAME("raysmaze", "v1.5", "Ray's Maze1.5", "521583e59bdc1d611f963cef1dc25869", 1408516),
-	BIGGAME("raysmaze", "v1.5/alt", "Ray's Maze1.5", "120e65bec953b981b2e0aed45ad45d70", 1408516),
-	FANGAME("Ray's World Builder Demo", "d252ee8e38c9abc50455d071a367d031", 116056),
+	FANGAME("Psychotic!", "d6229615b71b189f6ef71399a0856cd2", 367309),
+	FANGAME("P-W Adventure", "a8e9f97ee02f01de588a4dbabe55ca3f", 219216),
+	FANGAMEN("Pyramid of Ert", "Pyramid of Ert V1.2", "358b03ea9c978fbfd2ce2833daea00f8", 315783),
+	FANGAME("Queen Quest", "7ca009dad76827ce008c3c7fa01cab0a", 57026),
+	FANGAME("Queen Quest", "cde1255992101e0763687f45e0f47169", 57039), // alt version
+	FANGAME("Quest for T-Rex", "51aa29d24ca702c8980e959706ef0b76", 592584),
+	FANGAME("Quest for the Dark Sword", "d98c3879ff20ca7e835e3a630c2c74ef", 572576),
+	FANGAME("Radical Castle", "e424dea5542817435b4b6da41fd532cb", 355601),
+	FANGAME("Radical Castle 1.0", "7c7701dcab013c65510f97a8712fc419", 347278),
+	BIGGAME("raysmaze", "v1.5", "Ray's Maze1.5", "328096d3c7ccb838956c42b273f17b8e", 1408516),
+	BIGGAME("raysmaze", "v1.5/alt", "Ray's Maze1.5", "401cd46df5e49fa4171ed398b3e0227b", 1408516),
+	FANGAME("Ray's World Builder Demo", "eafea10db54530ac6e6128be31741542", 116056),
 	// Unhandled comparison case
-	FANGAME("Sands of Time", "b00ea866cb04cd87124e5720bc2c84c7", 122672), // Original file name "Sands of Time†"
-	BIGGAME("scepters", "", "Scepters", "f8db17cd96be056cf8a8bb9cfe46cf3a", 346595),
-	BIGGAME("scepters", "", "Scepters", "1fd7ca93ef16f4752fb46ee9cfa0949a", 347540), // alt version
-	FANGAME("Schmoozer", "e0f416bae626e2c638055b7f495d8c78", 221500),
+	FANGAME("Sands of Time", "d065662865d0cb9065812479ed7d2795", 122672), // Original file name "Sands of Time†"
+	BIGGAME("scepters", "", "Scepters", "e6c58e96b02f8eb46e0ccfe4f547045b", 346595),
+	BIGGAME("scepters", "", "Scepters", "2c824f1bd7b22c575c7be86ac88ebd23", 347540), // alt version
+	FANGAME("Schmoozer", "7bbb3d317d2074870c72b28d07984ef8", 221500),
 	// ??? problems with dog bitmap?
-	FANGAMEN("Space Adventure", "SpaceAdventure", "7b6c883b3510e21cfabf4c8caaeb1f16", 155356),
-	FANGAMEN("Space Adventure", "SpaceAdventure", "3bd6fc9327f35db5390a9bf86afcd872", 155356), // alt version
-	FANGAMEN("Spear of Destiny", "SpearOfDestiny", "f1252ff34dd279f4ec1844bb403a578c", 333665), // Original file name "SpearOfDestiny†"
-	FANGAME("Star Trek", "fe20d06bc50c7fcebda0db533e141d4a", 53320),
-	FANGAME("Strange Disappearance", "782fae517f7374cd7f43f428331ce445", 772282),
+	FANGAMEN("Space Adventure", "SpaceAdventure", "3908c75d639989a28993c59931fbe1ec", 155356),
+	FANGAMEN("Space Adventure", "SpaceAdventure", "e38d524cb778ed0beb77ee9299f0ed45", 155356), // alt version
+	FANGAMEN("Spear of Destiny", "SpearOfDestiny", "ac00a26f04f83b47c278cc1d226f48df", 333665), // Original file name "SpearOfDestiny†"
+	FANGAME("Star Trek", "3067332e6f0bb0314579f9bf102e1b56", 53320),
+	FANGAME("Strange Disappearance", "9d6e41b61c0fc90400e5da2fcb653a4a", 772282),
 	// Code 0x03 in text
-	FANGAME("Swamp Witch", "4f146c0a5c59e7d4717a0423271fa89d", 739781), // Original file name "Swamp Witch†"
-	FANGAME("Sweetspace Now!", "1d419bc0b04c51468ddc40a90125bf00", 123813), // Comes with Jumble
+	FANGAME("Swamp Witch", "bd8c8394be31f7845d55785b7ccfbbde", 739781), // Original file name "Swamp Witch†"
+	FANGAME("Sweetspace Now!", "574dc7dd25543f7a516d6524f0c5ab33", 123813), // Comes with Jumble
 	// Wrong scrolling in the first console text
-	FANGAMEN("Sword of Siegfried", "Sword of Siegfried 1.0", "1ee92830690f89ea142ac0847176a0c3", 234763),
-	FANGAME("Terrorist", "68208fa5e426312fb12402894add5e4a", 524469), // Original file name "Terrorist†"
-	FANGAME("Time Bomb", "b7a369d57d43ec8d9fd53832fd38d7db", 64564),
-	FANGAME("Time Bomb", "b7a369d57d43ec8d9fd53832fd38d7db", 64578), // Alt version
-	FANGAMEND("The Ashland Revolution", "The Ashland Revolution Demo", "3c7a1bdeab48a077a4f54fe69da61a9f", 145023), // Original file name "The Ashland Revolution Demo†"
-	FANGAME("The Axe-orcist", "bfdf6a4ce87e6b368977af3b683466db", 308764),
-	FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "0d11a6ca1357e27ffff5231fe89cc429", 231969),
-	FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "6c80fa6a36d16aa0edef86d8800c90db", 231969), // alt version
+	FANGAMEN("Sword of Siegfried", "Sword of Siegfried 1.0", "2ae8f21cfb228ce58ee47b767bdd8820", 234763),
+	FANGAME("Terrorist", "4398f711bc2a456e6d730641308593f0", 524469), // Original file name "Terrorist†"
+	FANGAME("Time Bomb", "e96f3e2efd1e3db6ad0be22180f5473c", 64564),
+	FANGAME("Time Bomb", "976180f9be0d1029aaba7774fec9767c", 64578), // Alt version
+	FANGAMEND("The Ashland Revolution", "The Ashland Revolution Demo", "18f1f5d1081b9a5676ccfb0c3b857059", 145023), // Original file name "The Ashland Revolution Demo†"
+	FANGAME("The Axe-orcist", "9718b72e86a9727bbd68e12fa992b268", 308764),
+	FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "c9b3c75814fc6b14feae044157bef252", 231969),
+	FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "4658ece81a6f211a828e747125482f48", 231969), // alt version
 	// Invalid rect in scene "Access Tube 1"
-	FANGAMEN("The Phoenix v1.2", "The Phoenix", "0a4a01b83c993408ae824cc4f63957ea", 431640),
-	FANGAME("The Phoenix", "0a4a01b83c993408ae824cc4f63957ea", 431643),
-	FANGAME("The Sultan's Palace", "98c845323489344d7e2c9d1c3e53d1fc", 456855),
+	FANGAMEN("The Phoenix v1.2", "The Phoenix", "fee9f1de7ad9096d084461d6066192b1", 431640),
+	FANGAME("The Phoenix", "bd6dabf7a19d2ab7902498a8513f8c71", 431643),
+	FANGAME("The Sultan's Palace", "fde31cbcc77b66969b4cfcd43075341e", 456855),
 	// Admission for on 3rd screen is messed up
-	FANGAME("The Tower", "135fe861928d15b5acd8b355460c54bf", 556539),
+	FANGAME("The Tower", "4cd8755ccb5bbeaf2e5f7848a8daa033", 556539),
 	// Polygons with ignored byte 1 and 2 on second scene
-	FANGAME("The Village", "b9b5cfbfc7f482eae7587b55edc135ed", 314828),
-	FANGAME("The Wizard's Apprentice", "7eff3cb7d1a3f59639c62cf196039745", 782824),
+	FANGAME("The Village", "fd35cad8c61064d6c8aaadab7070ccad", 314828),
+	FANGAME("The Wizard's Apprentice", "477c2d2d4672d968dfac1df2acef1dc9", 782824),
 	// Messed up first scene
-	FANGAMEND("Tombworld", "Demo TombWorld", "f7c86166e29fb8b57f7a1400d4963a4e", 664252), // Original file name "Demo TombWorld©"
+	FANGAMEND("Tombworld", "Demo TombWorld", "695734292024290d5d0aa6a66ff628f6", 664252), // Original file name "Demo TombWorld©"
 	// Doesn't go past first scene
-	BIGGAME("twisted", "", "Twisted! 1.6", "97ab265eddf0cfed6d43d062c853cbc0", 960954),
-	FANGAME("Volcano II", "4dbb7ec6111c0f872da8ed8ba14763c9", 82991), // Original file name "Volcano II†"
-	FANGAME("Wishing Well", "ece06c419cbb2d32941e6b5c7d9d7c1a", 103688),
-	FANGAME("Wizard's Warehouse", "ee1b86841583e2b58ac39bf97017dc7b", 159748),
-	FANGAMEN("Wizard's Warehouse 2", "WizWarehouse 2.0", "6502bd974fe149fe76d6d5ae9d1e6878", 230870),
-	FANGAME("ZikTuria", "1b934fca68d633d231dccd2047d2d274", 52972),
-	FANGAME("Zoony", "7bb293b81117cbd974ce54fafa06f258", 154990), // original filename "Zoony™"
+	BIGGAME("twisted", "", "Twisted! 1.6", "6e0be4c7d83231e56a431dc4ef7bf978", 960954),
+	FANGAME("Volcano II", "7941c08b34bc2408b98c0004c7154aeb", 82991), // Original file name "Volcano II†"
+	FANGAME("Wishing Well", "607a66461d65a73c1222d63dbde0175d", 103688),
+	FANGAME("Wizard's Warehouse", "18b4678c76961c1f3ae3013e13f691a3", 159748),
+	FANGAMEN("Wizard's Warehouse 2", "WizWarehouse 2.0", "e67ac67548236a73897a85cd12b30492", 230870),
+	FANGAME("ZikTuria", "a91559e6f04a67dcb9023a98a0faed77", 52972),
+	FANGAME("Zoony", "3f7418ea8672ea558521c178188cfce5", 154990), // original filename "Zoony™"
 
 	AD_TABLE_END_MARKER
 };


Commit: e8d27c782efa69bc5763c7cb75d7eebd832e581f
    https://github.com/scummvm/scummvm/commit/e8d27c782efa69bc5763c7cb75d7eebd832e581f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-15T21:20:28+01:00

Commit Message:
WAGE: Sorted all detection entries to dictionary sort

Changed paths:
    engines/wage/detection_tables.h


diff --git a/engines/wage/detection_tables.h b/engines/wage/detection_tables.h
index 07a1345..2b7278c 100644
--- a/engines/wage/detection_tables.h
+++ b/engines/wage/detection_tables.h
@@ -36,6 +36,8 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("3rd Floor", "140883954b7cd89b0ffabde6ee0073d4", 281423), // alt version
 	BIGGAME("afm", "v1.8", "Another Fine Mess 1.8", "8bbec64ffe9deee4ff48d27f01176814", 1420723),
 	BIGGAME("amot", "v1.8", "A Mess O' Trouble 1.8", "57de8f1f79a24fa1a296aa10242c3648", 1843104),
+	FANGAMEND("The Ashland Revolution", "The Ashland Revolution Demo", "18f1f5d1081b9a5676ccfb0c3b857059", 145023), // Original file name "The Ashland Revolution Demo†"
+	FANGAME("The Axe-orcist", "9718b72e86a9727bbd68e12fa992b268", 308764),
 	// Crash on third screen
 	FANGAME("Brownie's Dream", "379f2c810efc18bad932049d331df1b6", 440704),
 	FANGAMEN("Brownie's Time Travels", "Brownie's Time Travels v1.2", "d95999aff4e283bd21db686cfb2cb9b9", 471589),
@@ -78,6 +80,8 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("Find the Heart", "73935d313b666763e50d2cdc6b3b7908", 105871), // Standalone
 	FANGAMEN("Fortune Teller", "Fortune Teller 1.1", "3c09329fc3c92a70e5c8874cc763f5cb", 73931),
 	FANGAMEN("Haunted House", "Haunted House 1.5", "5e34e9fa13f4c90876f10a40ea1d1c79", 177500),
+	FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "c9b3c75814fc6b14feae044157bef252", 231969),
+	FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "4658ece81a6f211a828e747125482f48", 231969), // alt version
 	// Cropped graphics on first scene, cannot pass to in-game
 	FANGAME("Intro to Gothic", "606eec666f0b2d767e4423747e740434", 208067),
 	FANGAMEN("James Bond 007", "007", "2449924f2cb43454489a4ef91c0ee702", 50663),
@@ -112,14 +116,16 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAMEN("Pencils", "Pencils.99", "09dbcdbefe20536c2db1b1a4fb4e5ed3", 408551),
 	// Polygons with byte 1
 	FANGAME("Periapt", "7e26a7827c694232624321a5a6844511", 406006),
-	FANGAME("Psychotic!", "d6229615b71b189f6ef71399a0856cd2", 247693),
+	// Invalid rect in scene "Access Tube 1"
+	FANGAMEN("The Phoenix v1.2", "The Phoenix", "fee9f1de7ad9096d084461d6066192b1", 431640),
+	FANGAME("The Phoenix", "bd6dabf7a19d2ab7902498a8513f8c71", 431643),
+	FANGAME("Psychotic!", "d6229615b71b189f6ef71399a0856cd2", 367309),
 	FANGAME("Puzzle Piece Search", "6c21c1e0c6afef9300941abd7782dd16", 247693), // From Joshua's Worlds 1.0
 	FANGAME("The Puzzle Piece Search", "8fa1d80dd3f1ed69f45d15d774968995", 247338), // From Joshua's Worlds
 	FANGAME("The Puzzle Piece Search", "fb839ac4f22427f44e99bcc5afd57a0b", 247324), // Stnadalone
 	// Empty(?)  first scene
 	FANGAME("Pyramid of No Return", "4bf4c39b140f5aadb5f8c9a50153d18e", 385145),
 	// Cropped graphics at the first scene
-	FANGAME("Psychotic!", "d6229615b71b189f6ef71399a0856cd2", 367309),
 	FANGAME("P-W Adventure", "a8e9f97ee02f01de588a4dbabe55ca3f", 219216),
 	FANGAMEN("Pyramid of Ert", "Pyramid of Ert V1.2", "358b03ea9c978fbfd2ce2833daea00f8", 315783),
 	FANGAME("Queen Quest", "7ca009dad76827ce008c3c7fa01cab0a", 57026),
@@ -142,6 +148,7 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAMEN("Spear of Destiny", "SpearOfDestiny", "ac00a26f04f83b47c278cc1d226f48df", 333665), // Original file name "SpearOfDestiny†"
 	FANGAME("Star Trek", "3067332e6f0bb0314579f9bf102e1b56", 53320),
 	FANGAME("Strange Disappearance", "9d6e41b61c0fc90400e5da2fcb653a4a", 772282),
+	FANGAME("The Sultan's Palace", "fde31cbcc77b66969b4cfcd43075341e", 456855),
 	// Code 0x03 in text
 	FANGAME("Swamp Witch", "bd8c8394be31f7845d55785b7ccfbbde", 739781), // Original file name "Swamp Witch†"
 	FANGAME("Sweetspace Now!", "574dc7dd25543f7a516d6524f0c5ab33", 123813), // Comes with Jumble
@@ -150,14 +157,6 @@ static const ADGameDescription gameDescriptions[] = {
 	FANGAME("Terrorist", "4398f711bc2a456e6d730641308593f0", 524469), // Original file name "Terrorist†"
 	FANGAME("Time Bomb", "e96f3e2efd1e3db6ad0be22180f5473c", 64564),
 	FANGAME("Time Bomb", "976180f9be0d1029aaba7774fec9767c", 64578), // Alt version
-	FANGAMEND("The Ashland Revolution", "The Ashland Revolution Demo", "18f1f5d1081b9a5676ccfb0c3b857059", 145023), // Original file name "The Ashland Revolution Demo†"
-	FANGAME("The Axe-orcist", "9718b72e86a9727bbd68e12fa992b268", 308764),
-	FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "c9b3c75814fc6b14feae044157bef252", 231969),
-	FANGAMEN("The Hotel Caper", "The Hotel Caper V1.0", "4658ece81a6f211a828e747125482f48", 231969), // alt version
-	// Invalid rect in scene "Access Tube 1"
-	FANGAMEN("The Phoenix v1.2", "The Phoenix", "fee9f1de7ad9096d084461d6066192b1", 431640),
-	FANGAME("The Phoenix", "bd6dabf7a19d2ab7902498a8513f8c71", 431643),
-	FANGAME("The Sultan's Palace", "fde31cbcc77b66969b4cfcd43075341e", 456855),
 	// Admission for on 3rd screen is messed up
 	FANGAME("The Tower", "4cd8755ccb5bbeaf2e5f7848a8daa033", 556539),
 	// Polygons with ignored byte 1 and 2 on second scene





More information about the Scummvm-git-logs mailing list