[Scummvm-cvs-logs] SF.net SVN: scummvm:[49561] scummvm/trunk/engines/sci

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu Jun 10 09:48:33 CEST 2010


Revision: 49561
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49561&view=rev
Author:   thebluegr
Date:     2010-06-10 07:48:32 +0000 (Thu, 10 Jun 2010)

Log Message:
-----------
Moved the MoveCountType enum above the GameFeatures class, as it's the only class using it

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/engine/features.h
    scummvm/trunk/engines/sci/sci.h

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2010-06-10 07:41:48 UTC (rev 49560)
+++ scummvm/trunk/engines/sci/console.cpp	2010-06-10 07:48:32 UTC (rev 49561)
@@ -434,7 +434,7 @@
 	DebugPrintf("Sound type: %s\n", getSciVersionDesc(_engine->_features->detectDoSoundType()));
 	DebugPrintf("Graphics functions type: %s\n", getSciVersionDesc(_engine->_features->detectGfxFunctionsType()));
 	DebugPrintf("Lofs type: %s\n", getSciVersionDesc(_engine->_features->detectLofsType()));
-	DebugPrintf("Move count type: %s\n", (_engine->_features->detectMoveCountType() == kIncrementMoveCount) ? "increment" : "ignore");
+	DebugPrintf("Move count type: %s\n", (_engine->_features->handleMoveCount()) ? "increment" : "ignore");
 	DebugPrintf("SetCursor type: %s\n", getSciVersionDesc(_engine->_features->detectSetCursorType()));
 	DebugPrintf("View type: %s\n", viewTypeDesc[g_sci->getResMan()->getViewType()]);
 	DebugPrintf("Resource volume version: %s\n", g_sci->getResMan()->getVolVersionDesc());

Modified: scummvm/trunk/engines/sci/engine/features.h
===================================================================
--- scummvm/trunk/engines/sci/engine/features.h	2010-06-10 07:41:48 UTC (rev 49560)
+++ scummvm/trunk/engines/sci/engine/features.h	2010-06-10 07:48:32 UTC (rev 49561)
@@ -31,6 +31,12 @@
 
 namespace Sci {
 
+enum MoveCountType {
+	kMoveCountUninitialized,
+	kIgnoreMoveCount,
+	kIncrementMoveCount
+};
+
 class GameFeatures {
 public:
 	GameFeatures(SegManager *segMan, Kernel *kernel);

Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h	2010-06-10 07:41:48 UTC (rev 49560)
+++ scummvm/trunk/engines/sci/sci.h	2010-06-10 07:48:32 UTC (rev 49561)
@@ -118,12 +118,6 @@
 	SCI_VERSION_3 // LSL7, RAMA, Lighthouse
 };
 
-enum MoveCountType {
-	kMoveCountUninitialized,
-	kIgnoreMoveCount,
-	kIncrementMoveCount
-};
-
 /** Supported languages */
 enum kLanguage {
 	K_LANG_NONE = 0,


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