AVALANCHE: Remove code used for Demo

4 files changed, 2 insertions, 34 deletions

diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index f9e8dfc6e7..b7fa2ac48f 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -621,26 +621,11 @@ Common::String AvalancheEngine::elmToStr(Elm how) {
 	}
 }
 
-// Getting used only in demo() / call_menu(). Going to be implemented at the same time with these.
-bool AvalancheEngine::keyPressed() {
-	warning("STUB: keyPressed()");
-	return false;
-}
-
 // Same as keypressed1().
 void AvalancheEngine::flushBuffer() {
 	warning("STUB: flushBuffer()");
 }
 
-// Same as keypressed1().
-void AvalancheEngine::demo() {
-	warning("STUB: demo()");
-}
-
-void AvalancheEngine::runDemo() {
-	warning("STUB: runDemo()");
-}
-
 void AvalancheEngine::dosShell() {
 	warning("STUB: dosShell()");
 }
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index cd13cf5824..90f3436d63 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -147,7 +147,7 @@ private:
 	// From bootstrp:
 	enum Elm {kNormal, kMusical, kElmpoyten, kRegi};
 
-	Common::String _demoArgs, _argsWithNoFilename;
+	Common::String _argsWithNoFilename;
 	byte _originalMode;
 	byte *_old1c;
 	Common::String _segofs;
@@ -158,8 +158,6 @@ private:
 	Common::String elmToStr(Elm how);
 	bool keyPressed();
 	void flushBuffer();
-	void demo();
-	void runDemo();
 	void dosShell();
 	void bFlight();
 	Common::String commandCom();
diff --git a/engines/avalanche/gyro.h b/engines/avalanche/gyro.h
index 155feee8de..a50fa1536e 100644
--- a/engines/avalanche/gyro.h
+++ b/engines/avalanche/gyro.h
@@ -76,11 +76,6 @@ public:
 	byte _color;
 };
 
-struct DemoType {
-	uint16 _delay;
-	char _key, _extd;
-};
-
 typedef byte TuneType[31];
 
 struct QuasipedType {
@@ -351,11 +346,6 @@ public:
 	byte _him, _her, _it;
 	int32 _roomTime; // Set to 0 when you enter a room, added to in every loop.
 
-	// For the demo:
-	DemoType _demoRec;
-	Common::File _demoFile; // of demo_type
-	Common::DumpFile _demoFileSave; // uruk added it - first use located in constructor of Basher
-
 	byte _lastPerson; // Last person to have been selected using the People menu.
 	bool _doingSpriteRun; // Only set to True if we're doing a sprite_run at this moment. This stops the trippancy system from moving any of the sprites.
 	bool _holdTheDawn; // If this is true, calling Dawn will do nothing. It's used, for example, at the start, to stop Load from dawning.
diff --git a/engines/avalanche/scrolls.cpp b/engines/avalanche/scrolls.cpp
index 67c8fbd9c0..fdcf5202fc 100644
--- a/engines/avalanche/scrolls.cpp
+++ b/engines/avalanche/scrolls.cpp
@@ -151,12 +151,7 @@ void Scrolls::scrollModeNormal() {
 
 //#ifdef RECORD slowdown(); basher::count += 1; #endif
 
-			if (_vm->_gyro->demo) {
-				if (_vm->_basher->demo_ready())
-					break;
-				if (_vm->_enhanced->keypressede())
-					return;
-			} else if (_vm->_enhanced->keypressede())
+			if (_vm->_enhanced->keypressede())
 				break;
 		} while (!((mrelease > 0) || (buttona1()) || (buttonb1())));