- Simplified the parameters of some functions

- Replaced some EngineState parameters
- The SCI version is now obtained from the resource manager or the segment manager, thereby simplifying several functions
- Plugged 2 leaks in the fallback detector
- Renamed the segment manager and resource manager to "segmentManager" and "resourceManager" in all places, for consistency

svn-id: r43722

1 files changed, 2 insertions, 3 deletions

diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 4781af5870..9af7b35667 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -97,7 +97,7 @@ public:
 	Common::Language getLanguage() const;
 	Common::Platform getPlatform() const;
 	uint32 getFlags() const;
-	ResourceManager *getResMgr() const { return _resmgr; }
+	ResourceManager *getresourceManager() const { return _resourceManager; }
 	Kernel *getKernel() const { return _kernel; }
 	Vocabulary *getVocabulary() const { return _vocabulary; }
 
@@ -112,8 +112,7 @@ public:
 
 private:
 	const SciGameDescription *_gameDescription;
-	SciVersion _version;
-	ResourceManager *_resmgr;
+	ResourceManager *_resourceManager;
 	EngineState *_gamestate;
 	Kernel *_kernel;
 	Vocabulary *_vocabulary;