[Scummvm-cvs-logs] scummvm master -> ff0ab5b5814fd790595d72786bdac2b61937abed

DrMcCoy drmccoy at drmccoy.de
Wed Jul 4 00:41:30 CEST 2012


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

Summary:
8884d7735c GOB: Give the Geisha detection entries proper languages
1657b173cc GOB: Add a French DOS version of Geisha
ff0ab5b581 GOB: Don't print a warning when oGeisha_checkData() doesn't find fin.tot


Commit: 8884d7735c652de035f83889ef62ac4177a05996
    https://github.com/scummvm/scummvm/commit/8884d7735c652de035f83889ef62ac4177a05996
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-07-03T15:23:46-07:00

Commit Message:
GOB: Give the Geisha detection entries proper languages

Changed paths:
    engines/gob/detection/tables_geisha.h



diff --git a/engines/gob/detection/tables_geisha.h b/engines/gob/detection/tables_geisha.h
index 331e17e..83aa543 100644
--- a/engines/gob/detection/tables_geisha.h
+++ b/engines/gob/detection/tables_geisha.h
@@ -32,7 +32,21 @@
 		"geisha",
 		"",
 		AD_ENTRY1s("disk1.stk", "6eebbb98ad90cd3c44549fc2ab30f632", 212153),
-		UNK_LANG,
+		EN_ANY,
+		kPlatformPC,
+		ADGF_NO_FLAGS,
+		GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
+	},
+	kGameTypeGeisha,
+	kFeaturesEGA | kFeaturesAdLib,
+	"disk1.stk", "intro.tot", 0
+},
+{
+	{
+		"geisha",
+		"",
+		AD_ENTRY1s("disk1.stk", "6eebbb98ad90cd3c44549fc2ab30f632", 212153),
+		DE_DEU,
 		kPlatformPC,
 		ADGF_NO_FLAGS,
 		GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
@@ -63,7 +77,7 @@
 		"geisha",
 		"",
 		AD_ENTRY1s("disk1.stk", "e5892f00917c62423e93f5fd9920cf47", 208120),
-		UNK_LANG,
+		EN_ANY,
 		kPlatformAmiga,
 		ADGF_NO_FLAGS,
 		GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)


Commit: 1657b173cc58cea02d99f27abff5e336c52c6d0f
    https://github.com/scummvm/scummvm/commit/1657b173cc58cea02d99f27abff5e336c52c6d0f
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-07-03T15:26:37-07:00

Commit Message:
GOB: Add a French DOS version of Geisha

As supplied by misterhands in bug report #3539797.

Changed paths:
    engines/gob/detection/tables_geisha.h



diff --git a/engines/gob/detection/tables_geisha.h b/engines/gob/detection/tables_geisha.h
index 83aa543..d05659d 100644
--- a/engines/gob/detection/tables_geisha.h
+++ b/engines/gob/detection/tables_geisha.h
@@ -55,6 +55,20 @@
 	kFeaturesEGA | kFeaturesAdLib,
 	"disk1.stk", "intro.tot", 0
 },
+{ // Supplied by misterhands in bug report #3539797
+	{
+		"geisha",
+		"",
+		AD_ENTRY1s("disk1.stk", "0c4c16090921664f50baefdfd24d7f5d", 211889),
+		FR_FRA,
+		kPlatformPC,
+		ADGF_NO_FLAGS,
+		GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
+	},
+	kGameTypeGeisha,
+	kFeaturesEGA | kFeaturesAdLib,
+	"disk1.stk", "intro.tot", 0
+},
 {
 	{
 		"geisha",


Commit: ff0ab5b5814fd790595d72786bdac2b61937abed
    https://github.com/scummvm/scummvm/commit/ff0ab5b5814fd790595d72786bdac2b61937abed
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-07-03T15:38:56-07:00

Commit Message:
GOB: Don't print a warning when oGeisha_checkData() doesn't find fin.tot

Geisha looks if fin.tot exists to check if it needs to open disk3.stk.
This is completely normal, so don't print a warning.

Changed paths:
    engines/gob/inter_geisha.cpp



diff --git a/engines/gob/inter_geisha.cpp b/engines/gob/inter_geisha.cpp
index 8a4d424..8d05cef 100644
--- a/engines/gob/inter_geisha.cpp
+++ b/engines/gob/inter_geisha.cpp
@@ -200,8 +200,12 @@ void Inter_Geisha::oGeisha_checkData(OpFuncParams &params) {
 	if (mode == SaveLoad::kSaveModeNone) {
 
 		exists = _vm->_dataIO->hasFile(file);
-		if (!exists)
-			warning("File \"%s\" not found", file.c_str());
+		if (!exists) {
+			// NOTE: Geisha looks if fin.tot exists to check if it needs to open disk3.stk.
+			//       This is completely normal, so don't print a warning.
+			if (file != "fin.tot")
+				warning("File \"%s\" not found", file.c_str());
+		}
 
 	} else if (mode == SaveLoad::kSaveModeSave)
 		exists = _vm->_saveLoad->getSize(file.c_str()) >= 0;






More information about the Scummvm-git-logs mailing list