AVALANCHE: Move handleMoveKey() from Avalot to Trip.

4 files changed, 14 insertions, 6 deletions

diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 0dcfd8420d..7b315b3c07 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -164,16 +164,12 @@ void Avalot::handleKeyDown(const Common::Event &event) {
 	case Common::KEYCODE_PAGEDOWN:
 	case Common::KEYCODE_HOME:
 	case Common::KEYCODE_END:
-		handleMoveKey(event); // Fallthroughs are intended.
+		_vm->_trip.handleMoveKey(event); // Fallthroughs are intended.
 		break;
 	}
 
 }
 
-void Avalot::handleMoveKey(const Common::Event &event) { 
-	warning("STUB: Avalot::handleMoveKey()");
-}
-
 
 
 void Avalot::run(Common::String arg) {
diff --git a/engines/avalanche/avalot.h b/engines/avalanche/avalot.h
index 502358ede2..24ee4fe03e 100644
--- a/engines/avalanche/avalot.h
+++ b/engines/avalanche/avalot.h
@@ -46,7 +46,7 @@ public:
 
 	void handleKeyDown(const Common::Event &event);
 
-	void handleMoveKey(const Common::Event &event); // To replace Trip::tripkey().
+	
 
 
 
diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp
index 5f04ebca57..b90c50009b 100644
--- a/engines/avalanche/trip6.cpp
+++ b/engines/avalanche/trip6.cpp
@@ -1567,4 +1567,11 @@ void Trip::new_game_for_trippancy() {   /* Called by gyro.newgame */
 	tr[1].visible = false;
 }
 
+
+
+void Trip::handleMoveKey(const Common::Event &event) { 
+	warning("STUB: Avalot::handleMoveKey()");
+}
+
+
 } // End of namespace Avalanche.
diff --git a/engines/avalanche/trip6.h b/engines/avalanche/trip6.h
index c202b76530..bd9b00a608 100644
--- a/engines/avalanche/trip6.h
+++ b/engines/avalanche/trip6.h
@@ -223,6 +223,11 @@ public:
 
 	void take_a_step(byte &tripnum);
 
+
+
+	void handleMoveKey(const Common::Event &event); // To replace tripkey().
+
+
 	triptype tr[numtr];
 	getsettype getset[2];
 	byte aa[1600];