6 files changed, 37 insertions, 36 deletions
diff --git a/engines/avalanche/acci2.h b/engines/avalanche/acci2.h
index d34c3ffa64..e09c72ec22 100644
--- a/engines/avalanche/acci2.h
+++ b/engines/avalanche/acci2.h
@@ -33,6 +33,8 @@
 #include "common/scummsys.h"
 #include "common/str.h"
 
+
+
 namespace Avalanche {
 class AvalancheEngine;
 
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 2f098990a9..e96a2497ad 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -42,6 +42,7 @@
 #include "graphics/thumbnail.h"
 
 
+
 namespace Avalanche {
 
 AvalancheEngine *AvalancheEngine::s_Engine = 0;
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 393bb4d157..3ef5bcf935 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -58,6 +58,7 @@
 #include "graphics/cursorman.h"
 
 
+
 namespace Common {
 class RandomSource;
 }
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 7e0f84ed0f..e7a7a49fb1 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -234,7 +234,7 @@ void Avalot::run(Common::String arg) {
 	//	close(logfile);
 	warning("STUB: Avalot::run()");
 
-	_vm->_closing->end_of_program();
+	_vm->_closing->exitGame();
 }
 
 } // End of namespace Avalanche
diff --git a/engines/avalanche/closing2.cpp b/engines/avalanche/closing2.cpp
index 431b1af82e..c9bfcd0cd4 100644
--- a/engines/avalanche/closing2.cpp
+++ b/engines/avalanche/closing2.cpp
@@ -36,6 +36,8 @@
 #include "common/textconsole.h"
 #include "common/random.h"
 
+
+
 namespace Avalanche {
 
 Closing::Closing(AvalancheEngine *vm) {
@@ -43,23 +45,19 @@ Closing::Closing(AvalancheEngine *vm) {
 	warning("STUB: Closing::Closing()");
 }
 
-void Closing::get_screen(byte which) {
-	warning("STUB: Closing::get_screen()");
-}
-
-void Closing::show_screen() {
-	warning("STUB: Closing::show_screen()");
+void Closing::getScreen(ScreenType which) {
+	warning("STUB: Closing::getScreen()");
 }
 
-void Closing::quit_with(byte which, byte errorlev) {
-	warning("STUB: Closing::quit_with()");
+void Closing::showScreen() {
+	warning("STUB: Closing::showScreen()");
 }
 
-void Closing::put_in(Common::String x, uint16 where) {
-	warning("STUB: Closing::put_in()");
+void Closing::putIn(Common::String str, uint16 where) {
+	warning("STUB: Closing::putIn()");
 }
 
-void Closing::end_of_program() {
+void Closing::exitGame() {
 	const Common::String nouns[12] = {
 		"sackbut", "harpsichord", "camel", "conscience", "ice-cream", "serf",
 		"abacus", "castle", "carrots", "megaphone", "manticore", "drawbridge"
@@ -72,17 +70,17 @@ void Closing::end_of_program() {
 
 	Common::String result;
 
-	//nosound;
-	warning("STUB: Closing::end_of_program()");
+	//nosound();
+	warning("STUB: Closing::exitGame()");
 
-	get_screen(scr_nagscreen);
+	getScreen(kScreenNagScreen);
 	result = nouns[_vm->_rnd->getRandomNumber(12)] + " will " + verbs[_vm->_rnd->getRandomNumber(12)] + " you";
-	put_in(result, 1628);
-	show_screen(); /* No halt- it's already set up. */
+	putIn(result, 1628);
+	showScreen(); // No halt- it's already set up.
 }
 
-void Closing::bug_handler() {
-	warning("STUB: Closing::bug_handler()");
+void Closing::handleBug() {
+	warning("STUB: Closing::handleBug()");
 }
 
 } // End of namespace Avalanche.
diff --git a/engines/avalanche/closing2.h b/engines/avalanche/closing2.h
index ed73f9f321..14cf54bbf3 100644
--- a/engines/avalanche/closing2.h
+++ b/engines/avalanche/closing2.h
@@ -33,38 +33,37 @@
 #include "common/scummsys.h"
 #include "common/str.h"
 
+
+
 namespace Avalanche {
 class AvalancheEngine;
 
 class Closing {
 public:
-	static const int16 scr_bugalert = 1;
-	static const int16 scr_ramcram = 2;
-	static const int16 scr_nagscreen = 3;
-	static const int16 scr_twocopies = 5;
-
 	Closing(AvalancheEngine *vm);
 
-	void quit_with(byte which, byte errorlev);
-
-	void end_of_program();
+	void exitGame();
 
 private:
-	AvalancheEngine *_vm;
+	enum ScreenType {
+		kScreenBugAlert = 1,
+		kScreenRamCram = 2,
+		kScreenNagScreen = 3,
+		kScreenTwoCopies = 5,
+	};
 
-	typedef Common::String scrtype;
+	AvalancheEngine *_vm;
 
-	scrtype q /*absolute $B8FA:0*/; /* Nobody's using the graphics memory now. */
-	//file<scrtype> f;
-	void *exitsave;
+	Common::String q; //absolute $B8FA:0* ; Nobody's using the graphics memory now.
+	Common::File f;
 
-	void get_screen(byte which);
+	void getScreen(ScreenType which);
 
-	void show_screen();
+	void showScreen();
 
-	void put_in(Common::String x, uint16 where);
+	void putIn(Common::String str, uint16 where);
 
-	void bug_handler();
+	void handleBug();
 };
 
 } // End of namespace Avalanche.