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

[thebluegr at users.sourceforge.net]

Revision: 46959
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46959&view=rev
Author:   thebluegr
Date:     2010-01-03 22:50:39 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
Renamed SCI_VERSION_AUTODETECT to SCI_VERSION_NONE to signify its actual purpose

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/state.cpp
    scummvm/trunk/engines/sci/engine/static_selectors.cpp
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/sci.h

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2010-01-03 22:41:35 UTC (rev 46958)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2010-01-03 22:50:39 UTC (rev 46959)
@@ -101,10 +101,10 @@
 	_lastAnimateCounter = 0;
 	_lastAnimateTime = 0;
 
-	_setCursorType = SCI_VERSION_AUTODETECT;
-	_doSoundType = SCI_VERSION_AUTODETECT;
-	_lofsType = SCI_VERSION_AUTODETECT;
-	_gfxFunctionsType = SCI_VERSION_AUTODETECT;
+	_setCursorType = SCI_VERSION_NONE;
+	_doSoundType = SCI_VERSION_NONE;
+	_lofsType = SCI_VERSION_NONE;
+	_gfxFunctionsType = SCI_VERSION_NONE;
 	_moveCountType = kMoveCountUninitialized;
 	
 	_usesCdTrack = Common::File::exists("cdaudio.map");
@@ -328,7 +328,7 @@
 				if ((signed)offset + (int16)lofs >= (signed)script->_bufSize)
 					_lofsType = SCI_VERSION_1_MIDDLE;
 
-				if (_lofsType != SCI_VERSION_AUTODETECT)
+				if (_lofsType != SCI_VERSION_NONE)
 					return true;
 
 				// If we reach here, we haven't been able to deduce the lofs parameter
@@ -434,7 +434,7 @@
 								break;
 							}
 
-							if (_doSoundType != SCI_VERSION_AUTODETECT)
+							if (_doSoundType != SCI_VERSION_NONE)
 								return true;
 						}
 						break;
@@ -482,7 +482,7 @@
 }
 
 SciVersion EngineState::detectDoSoundType() {
-	if (_doSoundType == SCI_VERSION_AUTODETECT) {
+	if (_doSoundType == SCI_VERSION_NONE) {
 		if (getSciVersion() == SCI_VERSION_0_EARLY) {
 			// This game is using early SCI0 sound code (different headers than SCI0 late)
 			_doSoundType = SCI_VERSION_0_EARLY;
@@ -513,7 +513,7 @@
 }
 
 SciVersion EngineState::detectSetCursorType() {
-	if (_setCursorType == SCI_VERSION_AUTODETECT) {
+	if (_setCursorType == SCI_VERSION_NONE) {
 		if (getSciVersion() <= SCI_VERSION_01) {
 			// SCI0/SCI01 games never use cursor views
 			_setCursorType = SCI_VERSION_0_EARLY;
@@ -554,7 +554,7 @@
 }
 
 SciVersion EngineState::detectLofsType() {
-	if (_lofsType == SCI_VERSION_AUTODETECT) {
+	if (_lofsType == SCI_VERSION_NONE) {
 		// This detection only works (and is only needed) for SCI 1
 		if (getSciVersion() <= SCI_VERSION_01) {
 			_lofsType = SCI_VERSION_0_EARLY;
@@ -594,7 +594,7 @@
 }
 
 SciVersion EngineState::detectGfxFunctionsType() {
-	if (_gfxFunctionsType == SCI_VERSION_AUTODETECT) {
+	if (_gfxFunctionsType == SCI_VERSION_NONE) {
 		// This detection only works (and is only needed) for SCI0 games
 		if (getSciVersion() >= SCI_VERSION_01) {
 			_gfxFunctionsType = SCI_VERSION_0_LATE;

Modified: scummvm/trunk/engines/sci/engine/static_selectors.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-01-03 22:41:35 UTC (rev 46958)
+++ scummvm/trunk/engines/sci/engine/static_selectors.cpp	2010-01-03 22:50:39 UTC (rev 46959)
@@ -73,7 +73,7 @@
 	{    SCI_VERSION_1_EARLY,        SCI_VERSION_1_1,      "flags", 102 },
 	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,     "scaleX", 104 },
 	{        SCI_VERSION_1_1,        SCI_VERSION_1_1,     "scaleY", 105 },
-	{ SCI_VERSION_AUTODETECT, SCI_VERSION_AUTODETECT,            0,   0 }
+	{ SCI_VERSION_NONE,             SCI_VERSION_NONE,            0,   0 }
 };
 
 Common::StringList Kernel::checkStaticSelectorNames() {

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-01-03 22:41:35 UTC (rev 46958)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-01-03 22:50:39 UTC (rev 46959)
@@ -37,10 +37,10 @@
 
 namespace Sci {
 
-static SciVersion s_sciVersion = SCI_VERSION_AUTODETECT;
+static SciVersion s_sciVersion = SCI_VERSION_NONE;
 
 SciVersion getSciVersion() {
-	assert(s_sciVersion != SCI_VERSION_AUTODETECT);
+	assert(s_sciVersion != SCI_VERSION_NONE);
 	return s_sciVersion;
 }
 
@@ -1771,7 +1771,7 @@
 		s_sciVersion = SCI_VERSION_1_1;
 		return;
 	default:
-		s_sciVersion = SCI_VERSION_AUTODETECT;
+		s_sciVersion = SCI_VERSION_NONE;
 		error("detectSciVersion(): Unable to detect the game's SCI version");
 	}
 }

Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h	2010-01-03 22:41:35 UTC (rev 46958)
+++ scummvm/trunk/engines/sci/sci.h	2010-01-03 22:50:39 UTC (rev 46959)
@@ -88,7 +88,7 @@
 
 /** SCI versions */
 enum SciVersion {
-	SCI_VERSION_AUTODETECT,
+	SCI_VERSION_NONE,
 	SCI_VERSION_0_EARLY, // Early KQ4, 1988 xmas card
 	SCI_VERSION_0_LATE, // KQ4, LSL2, LSL3, SQ3 etc
 	SCI_VERSION_01, // KQ1 and multilingual games (S.old.*)
@@ -165,8 +165,8 @@
 
 inline static Common::String getSciVersionDesc(SciVersion version) {
 	switch (version) {
-	case SCI_VERSION_AUTODETECT:
-		return "Autodetect";
+	case SCI_VERSION_NONE:
+		return "Invalid SCI version";
 	case SCI_VERSION_0_EARLY:
 		return "Early SCI0";
 	case SCI_VERSION_0_LATE:


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