Moved _Win32ResExtractor to ScummEngine_v6 (and ideally, it should be confined to the HE classes only, but right now that is not feasible)

svn-id: r14082

3 files changed, 25 insertions, 22 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index bf1ec6b350..4137def1a7 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -326,19 +326,11 @@ protected:
 	
 	const OpcodeEntryV6 *_opcodesV6;
 
+	// HE v7.0+ games
+	Win32ResExtractor *_Win32ResExtractor;
+
 public:
-	ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs) : ScummEngine(detector, syst, gs) {
-		VAR_VIDEONAME = 0xFF;
-		VAR_RANDOM_NR = 0xFF;
-		VAR_STRING2DRAW = 0xFF;
-
-		VAR_TIMEDATE_YEAR = 0xFF;
-		VAR_TIMEDATE_MONTH = 0xFF;
-		VAR_TIMEDATE_DAY = 0xFF;
-		VAR_TIMEDATE_HOUR = 0xFF;
-		VAR_TIMEDATE_MINUTE = 0xFF;
-		VAR_TIMEDATE_SECOND = 0xFF;
-	}
+	ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs);
 
 protected:
 	virtual void setupOpcodes();
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index cdf29f2b6a..f0f021329c 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -853,13 +853,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
 		_insane = new Insane((ScummEngine_v6 *)this);
 	else
 		_insane = 0;
-
-	// HE v7.0+
-	if (_heversion >= 70) {
-		_Win32ResExtractor = new Win32ResExtractor(this);
-	} else {
-		_Win32ResExtractor = 0;
-	}
 }
 
 ScummEngine::~ScummEngine() {
@@ -905,6 +898,27 @@ ScummEngine::~ScummEngine() {
 	delete _debugger;
 }
 
+ScummEngine_v6::ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs)
+ : ScummEngine(detector, syst, gs) {
+	VAR_VIDEONAME = 0xFF;
+	VAR_RANDOM_NR = 0xFF;
+	VAR_STRING2DRAW = 0xFF;
+
+	VAR_TIMEDATE_YEAR = 0xFF;
+	VAR_TIMEDATE_MONTH = 0xFF;
+	VAR_TIMEDATE_DAY = 0xFF;
+	VAR_TIMEDATE_HOUR = 0xFF;
+	VAR_TIMEDATE_MINUTE = 0xFF;
+	VAR_TIMEDATE_SECOND = 0xFF;
+
+	// HE v7.0+
+	if (_heversion >= 70) {
+		_Win32ResExtractor = new Win32ResExtractor(this);
+	} else {
+		_Win32ResExtractor = 0;
+	}
+}
+
 void ScummEngine::go() {
 	launch();
 	mainRun();
diff --git a/scumm/scumm.h b/scumm/scumm.h
index e6089fb74d..18b938597e 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -1038,9 +1038,6 @@ protected:
 
 	Insane *_insane;
 
-	// HE v7.0+ games
-	Win32ResExtractor *_Win32ResExtractor;
-
 public:
 	uint16 _extraBoxFlags[65];