[Scummvm-cvs-logs] SF.net SVN: scummvm: [25952] scummvm/trunk/engines/scumm

[kirben at users.sourceforge.net]

Revision: 25952
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25952&view=rev
Author:   kirben
Date:     2007-03-03 05:19:22 -0800 (Sat, 03 Mar 2007)

Log Message:
-----------
Correct feature flags for the PC Engine version of Loom.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/plugin.cpp
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp	2007-03-03 12:59:48 UTC (rev 25951)
+++ scummvm/trunk/engines/scumm/plugin.cpp	2007-03-03 13:19:22 UTC (rev 25952)
@@ -224,8 +224,8 @@
 
 	{"loom", "EGA",      "ega", GID_LOOM, 3, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI, 0, UNK},
 	{"loom", "No Adlib", "ega", GID_LOOM, 3, 0, MDT_PCSPK,                        0, UNK},
+	{"loom", "PC-Engine",     0, GID_LOOM, 3, 0, MDT_NONE,                        GF_AUDIOTRACKS, Common::kPlatformPCEngine},
 	{"loom", "FM-TOWNS",     0, GID_LOOM, 3, 0, MDT_TOWNS,                        GF_AUDIOTRACKS | GF_OLD256, Common::kPlatformFMTowns},
-	{"loom", "PC-Engine",     0, GID_LOOM, 3, 0, MDT_NONE,                        GF_16COLOR | GF_AUDIOTRACKS | GF_OLD256, Common::kPlatformPCEngine},
 	{"loom", "VGA",      "vga", GID_LOOM, 4, 0, MDT_NONE,                         GF_AUDIOTRACKS,             Common::kPlatformPC},
 
 	{"pass", 0, 0, GID_PASS, 4, 0, MDT_PCSPK | MDT_ADLIB, GF_16COLOR, Common::kPlatformPC},
@@ -1660,7 +1660,7 @@
 		*engine = new ScummEngine_v2(syst, res);
 		break;
 	case 3:
-		if (res.game.features & GF_OLD256)
+		if ((res.game.features & GF_OLD256) || res.game.platform == Common::kPlatformPCEngine) 
 			*engine = new ScummEngine_v3(syst, res);
 		else
 			*engine = new ScummEngine_v3old(syst, res);

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2007-03-03 12:59:48 UTC (rev 25951)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2007-03-03 13:19:22 UTC (rev 25952)
@@ -595,8 +595,9 @@
  : ScummEngine(syst, dr) {
 
 	// All "classic" games (V5 and older) encrypted their data files
-	// with exception of the GF_OLD256 games.
-	if (!(_game.features & GF_OLD256))
+	// with exception of the GF_OLD256 games and the PC-Engine version
+	// of Loom.
+	if (!(_game.features & GF_OLD256) && _game.platform != Common::kPlatformPCEngine) 
 		_game.features |= GF_USE_KEY;
 
 	static const uint16 default_cursor_images[4][16] = {


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