4 files changed, 14 insertions, 65 deletions

diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index b7fa2ac48f..7d216fad33 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -519,63 +519,15 @@ Common::Point AvalancheEngine::getMousePos() {
 	return _eventMan->getMousePos();
 }
 
-// From Bootstrp:
-const char AvalancheEngine::kRuncodes[2][3] = {"et", "Go"};
-
-void AvalancheEngine::bFlightOn() {
-	_storage._skellern = kReset;
-	// setintvec(0x1c, &b_flight);
-}
-
-void AvalancheEngine::getArguments() {
-	// This function should mess around with command line arguments,
-	// but I am not sure if there'll be use of these arguments at all...
-	warning("STUB: getArguments()");
-}
-
-void AvalancheEngine::getSlope() {
-	// Same as get_arguments()
-	warning("STUB: getSlope()");
-}
-
-void AvalancheEngine::callMenu() {
-	warning("STUB: callMenu()");
-}
-
-void AvalancheEngine::runAvalot() {
-	bFlightOn();
-
-	_avalot->run(Common::String(kRuncodes[_firstTime]) + _arguments);
-	// TODO: Check if parameters are ever used (probably not) and eventually remove them.
-	// If there's an error initializing avalot, i'll handle it in there, not here
-
-	_firstTime = false;
-}
-
 Common::Error AvalancheEngine::run() {
 	Common::ErrorCode err = initialize();
 	if (err != Common::kNoError)
 		return err;
 
-	// From bootstrp:
-	_firstTime = true;
-
-	getArguments();
-	getSlope();
-
-	_zoomy = true;
-	// Don't call the menu by default. Might be modified later, if get_slope() gets implemented,
-	// because zoomy's value is given there. Not sure yet what "zoomy" stands for.
-	if (!_zoomy)
-		callMenu();    // Not run when zoomy.
-
 	do {
-		runAvalot();
+		_avalot->runAvalot();
 
 		// Needed for later implementation!!! Don't remove these comments!!!
-
-		//if (dosexitcode != 77)  quit(); // Didn't stop for us.
-
 		//switch (_storage._operation) {
 		//case kRunShootemup:
 		//	run("seu.avx", kJsb, kBflight, kNormal);
@@ -602,6 +554,11 @@ void AvalancheEngine::run(Common::String what, bool withJsb, bool withBflight, E
 	// Probably there'll be no need of this function, as all *.AVX-es will become classes.
 }
 
+void AvalancheEngine::bFlightOn() {
+	_storage._skellern = kReset;
+	// setintvec(0x1c, &b_flight);
+}
+
 void AvalancheEngine::bFlightOff() {
 	// setintvec(0x1c, old_1c);
 }
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 90f3436d63..16482c8c92 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -122,28 +122,18 @@ private:
 	AvalancheConsole *_console;
 	Common::Platform _platform;
 
-	static const int16 kRunShootemup = 1, kRunDosshell = 2, kRunGhostroom = 3, kRunGolden = 4;
-	static const char kRuncodes[2][3];
-	static const int16 kReset = 0;
-	static const bool kJsb = true, kNoJsb = false, kBflight = true, kNoBflight = false;
-
+#if 0
 	struct {
 		byte _operation;
 		uint16 _skellern;
 		byte _contents[1000];
 	} _storage;
 
-	Common::String _arguments;
-	bool _firstTime;
-	bool _zoomy;
+	static const int16 kRunShootemup = 1, kRunDosshell = 2, kRunGhostroom = 3, kRunGolden = 4;
+	static const int16 kReset = 0;
 
-	void bFlightOn();
-	void getArguments();
-	void getSlope();
-	void callMenu();
-	void runAvalot();
+	static const bool kJsb = true, kNoJsb = false, kBflight = true, kNoBflight = false;
 
-#if 0
 	// From bootstrp:
 	enum Elm {kNormal, kMusical, kElmpoyten, kRegi};
 
@@ -152,8 +142,10 @@ private:
 	byte *_old1c;
 	Common::String _segofs;
 	int32 _soundcard, _speed, _baseaddr, _irq, _dma;
+	bool _zoomy;
 
 	void run(Common::String what, bool withJsb, bool withBflight, Elm how);
+	void bFlightOn();
 	void bFlightOff();
 	Common::String elmToStr(Elm how);
 	bool keyPressed();
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index ac961a6d17..dbc38be178 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -160,7 +160,7 @@ void Avalot::setup() {
 	}
 }
 
-void Avalot::run(Common::String arg) {
+void Avalot::runAvalot() {
 	setup();
 
 	do {
diff --git a/engines/avalanche/avalot.h b/engines/avalanche/avalot.h
index 34a9d9f7ba..1f2046604f 100644
--- a/engines/avalanche/avalot.h
+++ b/engines/avalanche/avalot.h
@@ -42,7 +42,7 @@ public:
 
 	void handleKeyDown(Common::Event &event); // To replace Basher::keyboard_link() and Basher::typein().
 	void setup();
-	void run(Common::String arg);
+	void runAvalot();
 
 private:
 	AvalancheEngine *_vm;