6 files changed, 13 insertions, 15 deletions

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index fa64957bec..2d9cf6a42b 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -179,7 +179,7 @@ static void _free_graphics_input(EngineState *s) {
 }
 
 int game_init_sound(EngineState *s, int sound_flags) {
-	if (s->resmgr->_sciVersion >= SCI_VERSION_01)
+	if (s->resmgr->sciVersion() >= SCI_VERSION_01)
 		sound_flags |= SFX_STATE_FLAG_MULTIPLAY;
 
 	s->sfx_init_flags = sound_flags;
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 2ccd88b709..362e41a357 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -396,7 +396,7 @@ void Kernel::detectSciFeatures() {
 	features = 0;
 
 	// Initialize features based on SCI version
-	if (_resmgr->_sciVersion == SCI_VERSION_0) {
+	if (_resmgr->sciVersion() == SCI_VERSION_0) {
 		features |= kFeatureOldScriptHeader;
 		features |= kFeatureOldGfxFunctions;
 	}
@@ -419,10 +419,10 @@ void Kernel::detectSciFeatures() {
 		if (tmp == "motionCue")
 			features &= ~kFeatureOldGfxFunctions;
 
-		if (tmp == "egoMoveSpeed" && _resmgr->_sciVersion < SCI_VERSION_1_1)
+		if (tmp == "egoMoveSpeed" && _resmgr->sciVersion() < SCI_VERSION_1_1)
 			features |= kFeatureLofsAbsolute;
 
-		if (tmp == "sightAngle" && _resmgr->_sciVersion == SCI_VERSION_0)
+		if (tmp == "sightAngle" && _resmgr->sciVersion() == SCI_VERSION_0)
 			features |= kFeatureSci0Sci1Table;
 
 		if (tmp == "setVol")
@@ -642,7 +642,7 @@ void Kernel::mapFunctions() {
 	int mapped = 0;
 	int ignored = 0;
 	uint functions_nr = getKernelNamesSize();
-	uint max_functions_nr = (_resmgr->_sciVersion == SCI_VERSION_0) ? 0x72 : 0x7b;
+	uint max_functions_nr = (_resmgr->sciVersion() == SCI_VERSION_0) ? 0x72 : 0x7b;
 
 	if (functions_nr < max_functions_nr) {
 		warning("SCI version believed to have %d kernel"
@@ -833,7 +833,7 @@ reg_t *kernel_dereference_reg_pointer(EngineState *s, reg_t pointer, int entries
 }
 
 void Kernel::setDefaultKernelNames() {
-	bool isSci0 = (_resmgr->_sciVersion == SCI_VERSION_0);
+	bool isSci0 = (_resmgr->sciVersion() == SCI_VERSION_0);
 	int offset = 0;
 
 	// Check if we have a SCI01 game which uses a SCI1 kernel table (e.g. the KQ1 demo
@@ -862,7 +862,7 @@ void Kernel::setDefaultKernelNames() {
 		}
 	}
 
-	if (_resmgr->_sciVersion == SCI_VERSION_1_1) {
+	if (_resmgr->sciVersion() == SCI_VERSION_1_1) {
 		// HACK: KQ6CD calls unimplemented function 0x26
 		_kernelNames[0x26] = "Dummy";
 	}
@@ -898,10 +898,9 @@ static void vocab_get_knames11(ResourceManager *resmgr, Common::StringList &name
 bool Kernel::loadKernelNames() {
 	_kernelNames.clear();
 
-	switch (_resmgr->_sciVersion) {
+	switch (_resmgr->sciVersion()) {
 	case SCI_VERSION_0:
 	case SCI_VERSION_01:
-	case SCI_VERSION_01_VGA_ODD:
 	case SCI_VERSION_1:
 	case SCI_VERSION_1_1:
 		setDefaultKernelNames();
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index d5f094b540..6b481dfc25 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -693,7 +693,7 @@ int _reset_graphics_input(EngineState *s);
 
 static void reconstruct_sounds(EngineState *s) {
 	Song *seeker;
-	SongIteratorType it_type = s->resmgr->_sciVersion >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
+	SongIteratorType it_type = s->resmgr->sciVersion() >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
 
 	seeker = s->_sound._songlib._lib;
 
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index b7529c33bd..667c429821 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -93,7 +93,6 @@ void script_adjust_opcode_formats(int res_version) {
 	case SCI_VERSION_0:
 		break;
 	case SCI_VERSION_01:
-	case SCI_VERSION_01_VGA_ODD:
 	case SCI_VERSION_1:
 	case SCI_VERSION_1_1:
 		g_opcode_formats[op_lofsa][0] = Script_Offset;
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index f0e9863068..fd45ef5834 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -27,7 +27,7 @@
 
 namespace Sci {
 
-EngineState::EngineState(ResourceManager *res, sci_version_t version, uint32 flags)
+EngineState::EngineState(ResourceManager *res, SciVersion version, uint32 flags)
 : resmgr(res), _version(version), _flags(flags), _dirseeker(this) {
 	widget_serial_counter = 0;
 
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index a814a20df8..2fa1bd82a6 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -126,7 +126,7 @@ public:
 		kSegmentLength = 20 /**< Time segment length in ms */
 	};
 
-	SpeedThrottler(sci_version_t version) {
+	SpeedThrottler(SciVersion version) {
 		if (version >= SCI_VERSION_1_1)
 			_maxInstructions = 3300;
 		else if (version >= SCI_VERSION_1)
@@ -161,7 +161,7 @@ private:
 
 struct EngineState : public Common::Serializable {
 public:
-	EngineState(ResourceManager *res, sci_version_t version, uint32 flags);
+	EngineState(ResourceManager *res, SciVersion version, uint32 flags);
 	virtual ~EngineState();
 	virtual void saveLoadWithSerializer(Common::Serializer &ser);
 
@@ -171,7 +171,7 @@ public:
 
 	ResourceManager *resmgr; /**< The resource manager */
 
-	const sci_version_t _version; /**< The approximated patchlevel of the version to emulate */
+	const SciVersion _version; /**< The approximated patchlevel of the version to emulate */
 	const uint32 _flags;			/**< Specific game flags */
 
 	Common::String _gameName; /**< Designation of the primary object (which inherits from Game) */