1 files changed, 8 insertions, 40 deletions

diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 87eb3c2158..d2e5678ae9 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -32,7 +32,6 @@
 #include "avalanche/graphics.h"
 #include "avalanche/parser.h"
 #include "avalanche/avalot.h"
-#include "avalanche/pingo.h"
 #include "avalanche/dialogs.h"
 #include "avalanche/background.h"
 #include "avalanche/sequence.h"
@@ -42,6 +41,10 @@
 #include "avalanche/closing.h"
 #include "avalanche/sound.h"
 #include "avalanche/nim.h"
+#include "avalanche/clock.h"
+#include "avalanche/ghostroom.h"
+#include "avalanche/help.h"
+#include "avalanche/shootemup.h"
 
 #include "common/serializer.h"
 
@@ -76,7 +79,6 @@ public:
 	Clock *_clock;
 	GraphicManager *_graphics;
 	Parser *_parser;
-	Pingo *_pingo;
 	Dialogs *_dialogs;
 	Background *_background;
 	Sequence *_sequence;
@@ -86,6 +88,9 @@ public:
 	Closing *_closing;
 	SoundHandler *_sound;
 	Nim *_nim;
+	GhostRoom *_ghostroom;
+	Help *_help;
+	ShootEmUp *_shootemup;
 
 	OSystem *_system;
 
@@ -127,43 +132,6 @@ private:
 	AvalancheConsole *_console;
 	Common::Platform _platform;
 
-#if 0
-	struct {
-		byte _operation;
-		uint16 _skellern;
-		byte _contents[1000];
-	} _storage;
-
-	static const int16 kRunShootemup = 1, kRunDosshell = 2, kRunGhostroom = 3, kRunGolden = 4;
-	static const int16 kReset = 0;
-
-	static const bool kJsb = true, kNoJsb = false, kBflight = true, kNoBflight = false;
-
-	// From bootstrp:
-	enum Elm {kNormal, kMusical, kElmpoyten, kRegi};
-
-	Common::String _argsWithNoFilename;
-	byte _originalMode;
-	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();
-	void flushBuffer();
-	void dosShell();
-	void bFlight();
-	Common::String commandCom();
-	void explain(byte error);
-	void cursorOff();
-	void cursorOn();
-	void quit();
-#endif
-
 public:
 	// For Thinkabout:
 	static const bool kThing = true;
@@ -172,7 +140,6 @@ public:
 	static const char kSpludwicksOrder[3];
 
 	static const uint16 kNotes[12];
-	static const TuneType kTune;
 
 	bool _holdLeftMouse;
 
@@ -340,6 +307,7 @@ private:
 	void checkClick();
 	void fixFlashers();
 	void loadAlso(byte num);
+	void resetAllVariables();
 	void resetVariables();
 };