diff options
| author | Filippos Karapetis | 2009-09-23 10:55:35 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-23 10:55:35 +0000 |
| commit | 13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a (patch) | |
| tree | f0e1021c9235d3ad9c03a4a02688f9ba9111bc99 /engines/sci/resource.h | |
| parent | 63208a20fdc466bb6ec88dc09c7f2901ef144794 (diff) | |
| download | scummvm-rg350-13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a.tar.gz scummvm-rg350-13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a.tar.bz2 scummvm-rg350-13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a.zip | |
- 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
Diffstat (limited to 'engines/sci/resource.h')
| -rw-r--r-- | engines/sci/resource.h | 9 |
1 files changed, 1 insertions, 8 deletions
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 @@ -228,12 +228,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. */ ResourceManager(); @@ -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 |