From 13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Wed, 23 Sep 2009 10:55:35 +0000 Subject: - 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 --- engines/sci/resource.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'engines/sci/resource.h') diff --git a/engines/sci/resource.h b/engines/sci/resource.h index c6ae2ed1ab..2400f2c8dd 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -227,12 +227,6 @@ public: ViewType getViewType() const { return _viewType; } - /** - * Returns the SCI version as detected by the resource manager - * @return SCI version - */ - SciVersion sciVersion() const { return _sciVersion; } - /** * Creates a new SCI resource manager. */ @@ -296,7 +290,6 @@ protected: ResourceSource *_audioMapSCI1; //!< Currently loaded audio map for SCI1 ResVersion _volVersion; //!< RESOURCE.0xx version ResVersion _mapVersion; //!< RESOURCE.MAP version - SciVersion _sciVersion; //!< Detected SCI version */ /** * Initializes the resource manager @@ -431,7 +424,7 @@ protected: ViewType detectViewType(); bool hasSci0Voc999(); bool hasSci1Voc900(); - SciVersion detectSciVersion(); + void detectSciVersion(); }; } // End of namespace Sci -- cgit v1.2.3