[Scummvm-cvs-logs] SF.net SVN: scummvm: [31670] scummvm/trunk/engines/made

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Apr 23 20:22:07 CEST 2008


Revision: 31670
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31670&view=rev
Author:   thebluegr
Date:     2008-04-23 11:22:06 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
Removed file existence checks to determine game version and added game flags instead. Added the MD5 of the English floppy version of Return to Zork

Modified Paths:
--------------
    scummvm/trunk/engines/made/detection.cpp
    scummvm/trunk/engines/made/made.cpp
    scummvm/trunk/engines/made/made.h

Modified: scummvm/trunk/engines/made/detection.cpp
===================================================================
--- scummvm/trunk/engines/made/detection.cpp	2008-04-23 18:18:11 UTC (rev 31669)
+++ scummvm/trunk/engines/made/detection.cpp	2008-04-23 18:22:06 UTC (rev 31670)
@@ -85,8 +85,8 @@
 		},
 		0,
 		0,
+		GF_CD_COMPRESSED,
 		0,
-		0,
 	},
 
 	{
@@ -101,8 +101,24 @@
 		},
 		0,
 		0,
+		GF_CD,
 		0,
+	},
+
+	{
+		// Return to Zork - English floppy version
+		{
+			"rtz",
+			"Floppy",
+			AD_ENTRY1("rtz.prj", "764d02f52ce1c219f2c0066677fba4ce"),
+			Common::EN_ANY,
+			Common::kPlatformPC,
+			Common::ADGF_NO_FLAGS
+		},
 		0,
+		0,
+		GF_FLOPPY,
+		0,
 	},
 
 	{

Modified: scummvm/trunk/engines/made/made.cpp
===================================================================
--- scummvm/trunk/engines/made/made.cpp	2008-04-23 18:18:11 UTC (rev 31669)
+++ scummvm/trunk/engines/made/made.cpp	2008-04-23 18:22:06 UTC (rev 31670)
@@ -143,12 +143,17 @@
 	if (getFeatures() & GF_DEMO) {
 		_dat->open("demo.dat");
 		_res->open("demo.prj");
+	} else if (getFeatures() & GF_CD) {
+		_dat->open("rtzcd.dat");
+		_res->open("rtzcd.prj");
+	} else if (getFeatures() & GF_CD_COMPRESSED) {
+		_dat->openFromRed("rtzcd.red", "rtzcd.dat");
+		_res->open("rtzcd.prj");
+	} else if (getFeatures() & GF_FLOPPY) {
+		_dat->open("rtz.dat");
+		_res->open("rtz.prj");
 	} else {
-		if (Common::File::exists("rtzcd.dat"))
-			_dat->open("rtzcd.dat");
-		else
-			_dat->openFromRed("rtzcd.red", "rtzcd.dat");
-		_res->open("rtzcd.prj");
+		error("Unknown game features");
 	}
 
 	_eventMouseX = _eventMouseY = 0;

Modified: scummvm/trunk/engines/made/made.h
===================================================================
--- scummvm/trunk/engines/made/made.h	2008-04-23 18:18:11 UTC (rev 31669)
+++ scummvm/trunk/engines/made/made.h	2008-04-23 18:22:06 UTC (rev 31670)
@@ -48,7 +48,10 @@
 namespace Made {
 
 enum MadeGameFeatures {
-	GF_DEMO = 1 << 0
+	GF_DEMO = 1 << 0,
+	GF_CD = 1 << 1,
+	GF_CD_COMPRESSED = 1 << 2,
+	GF_FLOPPY = 1 << 3
 };
 
 struct MadeGameDescription;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list