Reduce dependency from common/advancedDetector.h

svn-id: r25156

4 files changed, 28 insertions, 16 deletions

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 17fc74db90..b1888e362e 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -441,12 +441,12 @@ int AgiEngine::agiDetectGame() {
 
 	assert(_gameDescription != NULL);
 
-	_opt.amigaMode = ((_gameDescription->features & AGI_AMIGA) == AGI_AMIGA);
-	_opt.agdsMode = ((_gameDescription->features & AGI_AGDS) == AGI_AGDS);
-	_opt.agimouse = ((_gameDescription->features & AGI_MOUSE) == AGI_MOUSE);
+	_opt.amigaMode = ((getFeatures() & AGI_AMIGA) == AGI_AMIGA);
+	_opt.agdsMode = ((getFeatures() & AGI_AGDS) == AGI_AGDS);
+	_opt.agimouse = ((getFeatures() & AGI_MOUSE) == AGI_MOUSE);
 
 
-	if(_gameDescription->version <= 0x2999) {
+	if(getVersion() <= 0x2999) {
 		_loader = new AgiLoader_v2(this);
 	} else {
 		_loader = new AgiLoader_v3(this);
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 6d58d5944b..6b2f4d98c4 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -29,7 +29,6 @@
 #include "common/scummsys.h"
 #include "common/endian.h"
 #include "common/util.h"
-#include "common/advancedDetector.h"
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/system.h"
@@ -111,13 +110,7 @@ enum AgiGameFeatures {
 
 };
 
-struct AGIGameDescription {
-	Common::ADGameDescription desc;
-
-	int gameType;
-	uint32 features;
-	uint16 version;
-};
+struct AGIGameDescription;
 
 enum {
 	NO_GAMEDIR = 0,
@@ -531,6 +524,8 @@ public:
 	}
 
 	const AGIGameDescription *_gameDescription;
+	uint32 getFeatures() const;
+	uint16 getVersion() const;
 
 private:
 
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 1b4e35fea4..a5e320631d 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -31,6 +31,23 @@
 
 
 namespace Agi {
+
+struct AGIGameDescription {
+	Common::ADGameDescription desc;
+
+	int gameType;
+	uint32 features;
+	uint16 version;
+};
+
+uint32 AgiEngine::getFeatures() const {
+	return _gameDescription->features;
+}
+
+uint16 AgiEngine::getVersion() const {
+	return _gameDescription->version;
+}
+
 static GameList GAME_detectGames(const FSList &fslist);
 }
 
@@ -834,12 +851,12 @@ static const AGIGameDescription gameDescriptions[] = {
 	FANMADE("Journey Of Chef", "aa0a0b5a6364801ae65fdb96d6741df5"),
 	FANMADE("Jukebox (v1.0)", "c4b9c5528cc67f6ba777033830de7751"),
 	FANMADE("Justin Quest (v1.0 in development)", "103050989da7e0ffdc1c5e1793a4e1ec"),
-	FANMADE("J�ulumaa (v0.05) (Estonian)", "53982ecbfb907e41392b3961ad1c3475"),
+	FANMADE("Jï ½ulumaa (v0.05) (Estonian)", "53982ecbfb907e41392b3961ad1c3475"),
 	FANMADE("Kings Quest 2  - Breast Intentions (v2.0)", "6b4f796d0421d2e12e501b511962e03a"),
 	FANMADE("Lasse Holm: The Quest for Revenge (v1.0)", "f9fbcc8a4ef510bfbb92423296ff4abb"),
 	FANMADE("Lawman for Hire", "c78b28bfd3767dd455b992cd8b7854fa"),
 	FANMADE("Lefty Goes on Vacation (Not in The Right Place)", "ccdc49a33870310b01f2c48b8a1f3c34"),
-	FANMADE("Les Ins�parables (v1.0)", "4b780887cab0ecabc5eca319acb3acf2"),
+	FANMADE("Les Insï ½parables (v1.0)", "4b780887cab0ecabc5eca319acb3acf2"),
 	FANMADE("Little Pirate (Demo 2 v0.6)", "437068efe4ec32d436da09d6f2ea56e1"),
 	FANMADE("Lost Eternity (v1.0)", "95f15c5632feb8a39e9ca3d9af35fcc9"),
 	FANMADE("MD Quest - The Search for Michiel (v0.10)", "2a6fcb21d2b5e4144c38ed817fabe8ee"),
diff --git a/engines/agi/id.cpp b/engines/agi/id.cpp
index 2875974faf..2bcaf4e2d5 100644
--- a/engines/agi/id.cpp
+++ b/engines/agi/id.cpp
@@ -32,7 +32,7 @@ namespace Agi {
 int AgiEngine::v2IdGame() {
 	int ver;
 
-	ver = _gameDescription->version;
+	ver = getVersion();
 	_game.ver = ver;
 	debugC(2, kDebugLevelMain, "game.ver = 0x%x", _game.ver);
 	agiSetRelease(ver);
@@ -51,7 +51,7 @@ int AgiEngine::v2IdGame() {
 int AgiEngine::v3IdGame() {
 	int ver;
 
-	ver = _gameDescription->version;
+	ver = getVersion();
 	_game.ver = ver;
 	debugC(2, kDebugLevelMain, "game.ver = 0x%x", _game.ver);
 	agiSetRelease(ver);