[Scummvm-cvs-logs] SF.net SVN: scummvm:[46978] scummvm/trunk/engines/mohawk

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Mon Jan 4 18:37:30 CET 2010


Revision: 46978
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46978&view=rev
Author:   mthreepwood
Date:     2010-01-04 17:37:25 +0000 (Mon, 04 Jan 2010)

Log Message:
-----------
Minor cleanup; remove GF_10TH, it's not used or needed anywhere.

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

Modified: scummvm/trunk/engines/mohawk/bitmap.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/bitmap.cpp	2010-01-04 17:30:47 UTC (rev 46977)
+++ scummvm/trunk/engines/mohawk/bitmap.cpp	2010-01-04 17:37:25 UTC (rev 46978)
@@ -625,7 +625,6 @@
 	if (_info.colorsUsed == 0)
 		_info.colorsUsed = 256;
 		
-	// TODO: Myst ME's Help.dat contains WDIB's with 24bpp color.
 	if (_info.bitsPerPixel != 8 && _info.bitsPerPixel != 24)
 		error("%dbpp Bitmaps not supported", _info.bitsPerPixel);
 		

Modified: scummvm/trunk/engines/mohawk/detection.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/detection.cpp	2010-01-04 17:30:47 UTC (rev 46977)
+++ scummvm/trunk/engines/mohawk/detection.cpp	2010-01-04 17:37:25 UTC (rev 46978)
@@ -301,7 +301,7 @@
 			Common::GUIO_NONE
 		},
 		GType_MYST,
-		GF_ME|GF_10TH,
+		GF_ME,
 		0,
 	},
 	
@@ -319,7 +319,7 @@
 			Common::GUIO_NONE
 		},
 		GType_MYST,
-		GF_ME|GF_10TH,
+		GF_ME,
 		0,
 	},
 	
@@ -409,7 +409,7 @@
 			Common::GUIO_NONE
 		},
 		GType_RIVEN,
-		GF_DVD|GF_10TH,
+		GF_DVD,
 		0,
 	},
 	
@@ -617,7 +617,7 @@
 		0
 	},
 
-	// In The 1rst Degree
+	// In The 1st Degree
 	// French Windows
 	// From Strangerke
 	{

Modified: scummvm/trunk/engines/mohawk/mohawk.h
===================================================================
--- scummvm/trunk/engines/mohawk/mohawk.h	2010-01-04 17:30:47 UTC (rev 46977)
+++ scummvm/trunk/engines/mohawk/mohawk.h	2010-01-04 17:37:25 UTC (rev 46978)
@@ -54,9 +54,8 @@
 enum MohawkGameFeatures {
 	GF_ME =      (1 << 0),	// Myst Masterpiece Edition
 	GF_DVD =     (1 << 1),
-	GF_10TH =    (1 << 2),	// 10th Anniversary
-	GF_DEMO =    (1 << 3),
-	GF_HASMIDI = (1 << 4)
+	GF_DEMO =    (1 << 2),
+	GF_HASMIDI = (1 << 3)
 };
 
 struct MohawkGameDescription;
@@ -93,10 +92,11 @@
 
 	void pauseGame();
 
-protected:
+private:
 	PauseDialog *_pauseDialog;
 	void pauseEngineIntern(bool);
 
+protected:
 	// An array holding the main Mohawk archives require by the games
 	Common::Array<MohawkFile *> _mhk;
 };


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