cleanup

svn-id: r6262

2 files changed, 27 insertions, 29 deletions

diff --git a/scumm/scumm.h b/scumm/scumm.h
index b4bbcdac39..2d24efbc5d 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -268,18 +268,29 @@ public:
 
 	void mainRun();
 
+	void scummInit();
+	int scummLoop(int delta);
+	void initScummVars();
+
+	void launch();
+
+	Scumm(GameDetector *detector, OSystem *syst);
+	virtual ~Scumm();
+
+	void go();
+
+	void waitForTimer(int msec_delay);
+
+	void updateCursor();
+	void animateCursor();
+	void updatePalette();
+
 	/* _insane vars */
 
 	int _smushFrameRate;
 	bool _insaneState;
 	bool _videoFinished;
 	
-	
-	void scummInit();
-	void scummMain(int argc, char **argv); // is it still used ?
-	int scummLoop(int delta);
-	void initScummVars();
-
 	const char *getResDataPath() const { return _gameDataPath; }
 	const char *getGameDataPath() const {
 		if (_features & GF_AFTER_V8) {
@@ -1026,19 +1037,6 @@ public:
 	byte VAR_CUSTOMSCALETABLE;
 	byte VAR_VIDEONAME;
 	byte VAR_V6_SOUNDMODE;
-
-	void launch();
-
-	Scumm(GameDetector *detector, OSystem *syst);
-	virtual ~Scumm();
-
-	void go();
-
-	void waitForTimer(int msec_delay);
-
-	void updateCursor();
-	void animateCursor();
-	void updatePalette();
 };
 
 // This is a constant lookup table of reverse bit masks
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 0fca8709d2..12292137f7 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -200,13 +200,6 @@ void Scumm::scummInit()
 	tempMusic = 0;
 	debug(9, "scummInit");
 
-	if (_features & GF_OLD_BUNDLE)
-		_resourceHeaderSize = 2; // FIXME - to be rechecked
-	else if (_features & GF_SMALL_HEADER)
-		_resourceHeaderSize = 6;
-	else
-		_resourceHeaderSize = 8;
-
 	if (_features & GF_AFTER_V7) {
 		initScreens(0, 0, _realWidth, _realHeight);
 	} else {
@@ -228,7 +221,7 @@ void Scumm::scummInit()
 	setShake(0);
 	setupCursor();
 	
-	/* Allocate and initilise actors */
+	// Allocate and Initialize actors
 	_actors = new Actor[NUM_ACTORS];
 	for (i = 1, a = getFirstActor(); ++a, i < NUM_ACTORS; i++) {
 		a->number = i;
@@ -1584,6 +1577,8 @@ void Scumm::launch()
 
 	setupScummVars();
 
+	setupOpcodes();
+
 	if (_features & GF_AFTER_V8)
 		NUM_ACTORS = 80;
 	else if ((_features & GF_AFTER_V7) || (_gameId == GID_SAMNMAX))
@@ -1603,9 +1598,14 @@ void Scumm::launch()
 		_bootParam = -7873;
 	}
 
-	readIndexFile();
+	if (_features & GF_OLD_BUNDLE)
+		_resourceHeaderSize = 2; // FIXME - to be rechecked
+	else if (_features & GF_SMALL_HEADER)
+		_resourceHeaderSize = 6;
+	else
+		_resourceHeaderSize = 8;
 
-	setupOpcodes();
+	readIndexFile();
 
 	scummInit();