- Moved the SCI version in a global variable

- Changed all the SCI version checks to use getSciVersion()
- Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine)

The fallback detector should work correctly now

svn-id: r44269

1 files changed, 34 insertions, 4 deletions

diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 6f7eb90c6a..a48fc2e202 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -109,7 +109,6 @@ public:
 
 	const char* getGameID() const;
 	int getResourceVersion() const;
-	SciVersion getVersion() const;
 	Common::Language getLanguage() const;
 	Common::Platform getPlatform() const;
 	uint32 getFlags() const;
@@ -126,8 +125,6 @@ public:
 	/** Remove the 'TARGET-' prefix of the given filename, if present. */
 	Common::String unwrapFilename(const Common::String &name) const;
 
-	Common::String getSciVersionDesc(SciVersion version) const;
-
 private:
 	const SciGameDescription *_gameDescription;
 	ResourceManager *_resMan;
@@ -137,13 +134,46 @@ private:
 	Console *_console;
 };
 
+extern SciVersion _sciVersion;
+
 /**
  * Convenience function to obtain the active SCI version.
  */
 inline static SciVersion getSciVersion() {
-	return ((SciEngine*)g_engine)->getVersion();
+	assert (_sciVersion != SCI_VERSION_AUTODETECT);
+	return _sciVersion;
 }
 
+inline static Common::String getSciVersionDesc(SciVersion version) {
+	switch (version) {
+	case SCI_VERSION_AUTODETECT:
+		return "Autodetect";
+	case SCI_VERSION_0_EARLY:
+		return "Early SCI0";
+	case SCI_VERSION_0_LATE:
+		return "Late SCI0";
+	case SCI_VERSION_01:
+		return "SCI01";
+	case SCI_VERSION_1_EGA:
+		return "SCI1 EGA";
+	case SCI_VERSION_1_EARLY:
+		return "Early SCI1";
+	case SCI_VERSION_1_MIDDLE:
+		return "Middle SCI1";
+	case SCI_VERSION_1_LATE:
+		return "Late SCI1";
+	case SCI_VERSION_1_1:
+		return "SCI1.1";
+	case SCI_VERSION_2:
+		return "SCI2";
+	case SCI_VERSION_2_1:
+		return "SCI2.1";
+	case SCI_VERSION_3:
+		return "SCI3";
+	default:
+		return "Unknown";
+	}
+}
 
 } // End of namespace Sci