[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.169,2.170 scumm.cpp,1.61,1.62 scumm.h,1.414,1.415

Max Horn fingolfin at users.sourceforge.net
Sun Jun 27 06:34:00 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27930

Modified Files:
	intern.h scumm.cpp scumm.h 
Log Message:
Moved _Win32ResExtractor to ScummEngine_v6 (and ideally, it should be confined to the HE classes only, but right now that is not feasible)

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.169
retrieving revision 2.170
diff -u -d -r2.169 -r2.170
--- intern.h	24 Jun 2004 15:13:00 -0000	2.169
+++ intern.h	27 Jun 2004 13:33:02 -0000	2.170
@@ -326,19 +326,11 @@
 	
 	const OpcodeEntryV6 *_opcodesV6;
 
-public:
-	ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs) : ScummEngine(detector, syst, gs) {
-		VAR_VIDEONAME = 0xFF;
-		VAR_RANDOM_NR = 0xFF;
-		VAR_STRING2DRAW = 0xFF;
+	// HE v7.0+ games
+	Win32ResExtractor *_Win32ResExtractor;
 
-		VAR_TIMEDATE_YEAR = 0xFF;
-		VAR_TIMEDATE_MONTH = 0xFF;
-		VAR_TIMEDATE_DAY = 0xFF;
-		VAR_TIMEDATE_HOUR = 0xFF;
-		VAR_TIMEDATE_MINUTE = 0xFF;
-		VAR_TIMEDATE_SECOND = 0xFF;
-	}
+public:
+	ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs);
 
 protected:
 	virtual void setupOpcodes();

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- scumm.cpp	27 Jun 2004 11:12:23 -0000	1.61
+++ scumm.cpp	27 Jun 2004 13:33:02 -0000	1.62
@@ -853,13 +853,6 @@
 		_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 @@
 	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();

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -d -r1.414 -r1.415
--- scumm.h	27 Jun 2004 10:54:31 -0000	1.414
+++ scumm.h	27 Jun 2004 13:33:03 -0000	1.415
@@ -1038,9 +1038,6 @@
 
 	Insane *_insane;
 
-	// HE v7.0+ games
-	Win32ResExtractor *_Win32ResExtractor;
-
 public:
 	uint16 _extraBoxFlags[65];
 





More information about the Scummvm-git-logs mailing list