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

sev at users.sourceforge.net sev at users.sourceforge.net
Wed Jan 2 19:59:15 CET 2008


Revision: 30162
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30162&view=rev
Author:   sev
Date:     2008-01-02 10:59:15 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
Oops. Moved too much code in the last commit.

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

Modified: scummvm/trunk/engines/scumm/cursor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/cursor.cpp	2008-01-02 18:46:16 UTC (rev 30161)
+++ scummvm/trunk/engines/scumm/cursor.cpp	2008-01-02 18:59:15 UTC (rev 30162)
@@ -468,12 +468,6 @@
 }
 
 void ScummEngine_v5::resetCursors() {
-	// All "classic" games (V5 and older) encrypted their data files
-	// 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] = {
 		/* cross-hair */
 		{ 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0080, 0x0000, 0x7e3f,

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2008-01-02 18:46:16 UTC (rev 30161)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2008-01-02 18:59:15 UTC (rev 30162)
@@ -602,6 +602,12 @@
 ScummEngine_v5::ScummEngine_v5(OSystem *syst, const DetectorResult &dr)
  : ScummEngine(syst, dr) {
 
+	// All "classic" games (V5 and older) encrypted their data files
+	// 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;
+
 	resetCursors();
 
 	// Setup flashlight


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