AVALANCHE: Keep the functions connected to command line arguments and the main menu for later. Minimal cosmetic modifications in the order of the functions.

2 files changed, 32 insertions, 19 deletions

diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 80c2ffc838..d8a43ba2ad 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -39,7 +39,7 @@
 
 namespace Avalanche {
 
-	void avalot(bool firstTime, Common::String arguments) {
+	void avalot(Common::String arg) {
 		warning("STUB: avalot()"); // That will be a class made from avalot9.cpp !!! - or something like that
 	}
 
@@ -96,6 +96,8 @@ namespace Avalanche {
 
 	// From Bootstrp:
 
+	const char AvalancheEngine::runcodes[2][3] = {"et", "Go"};
+
 	void AvalancheEngine::cursor_off() {
 		warning("STUB: cursor_off()");
 	}
@@ -163,10 +165,25 @@ namespace Avalanche {
 		// Probably there'll be no need of this function, as all *.AVX-es will become classes.
 	}
 
+	void AvalancheEngine::get_arguments() {
+		// 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: get_arguments()"); 
+	}
+
+	void AvalancheEngine::get_slope() {
+		// Same as get_arguments()
+		warning("STUB: get_slope()");
+	}
+
+	void AvalancheEngine::call_menu() {
+		warning("STUB: call_menu()");
+	}
+
 	void AvalancheEngine::run_avalot() {
 		bflight_on();
 
-		avalot(first_time, arguments);  // TODO: Check if parameteres are ever use and eventually remove them
+		avalot(Common::String(runcodes[first_time]) + arguments);  // TODO: Check if parameteres are ever use and eventually remove them
 		// If there's an error initalizing avalot, i'll handle it in there, not here
 		first_time = false;
 	}
@@ -175,10 +192,6 @@ namespace Avalanche {
 		warning("STUB: run_the_demo()");
 	}
 
-	void AvalancheEngine::get_arguments() {
-		warning("STUB: get_arguments()");
-	}
-
 	void AvalancheEngine::dos_shell() {
 		warning("STUB: dos_shell()");
 	}
@@ -196,13 +209,9 @@ namespace Avalanche {
 		warning("STUB: demo()");
 	}
 
-	void AvalancheEngine::call_menu() {
-		warning("STUB: call_menu()");
-	}
+	
+
 
-	void AvalancheEngine::get_slope() {
-		warning("STUB: get_slope()");
-	}
 
 
 
@@ -223,6 +232,9 @@ namespace Avalanche {
 		get_arguments();
 		get_slope();
 
+		zoomy = false; 
+		// Call the menu by default. Might be modified later, if get_slope() gets implemented,
+		// becouse zoomy's value is given there. Not sure yet what "zoomy" stands for.
 		if (! zoomy)  call_menu();    /* Not run when zoomy. */
 
 		do {
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 6837ea5aa7..e6148be780 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -85,6 +85,8 @@ private:
 
 	static const int16 _runShootemup = 1, _runDosshell = 2, _runGhostroom = 3, _runGolden = 4;
 
+	static const char runcodes[2][3];
+
 	static const int16 _reset_ = 0;
 
 	static const bool _jsb = true, _no_jsb = false, _bflight = true, _no_bflight = false;
@@ -130,12 +132,16 @@ private:
 
 	void run(Common::String what, bool with_jsb, bool with_bflight, elm how);
 
+	void get_arguments();
+
+	void get_slope();
+
+	void call_menu();
+
 	void run_avalot();
 
 	void run_the_demo();
 
-	void get_arguments();
-
 	void dos_shell();
 
 	bool keypressed1();
@@ -143,11 +149,6 @@ private:
 	void flush_buffer();
 
 	void demo();
-
-	void call_menu();
-
-	void get_slope();
-
 };
 
 } // End of namespace Avalanche