AVALANCHE: Move strf() from Avalanche to Gyro.

4 files changed, 7 insertions, 14 deletions

diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 09695cd236..35693ed200 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -170,11 +170,6 @@ void AvalancheEngine::quit() {
 	cursor_on();
 }
 
-Common::String AvalancheEngine::strf(int32 x) {
-	Common::String q = Common::String::format("%d", x);
-	return q;
-}
-
 // Needed in dos_shell(). TODO: Remove later.
 Common::String AvalancheEngine::command_com() {
 	warning("STUB: command_com()");
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index a2b7ab6ae8..94ac6afe42 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -161,8 +161,6 @@ private:
 
 	void quit();
 
-	Common::String strf(int32 x);
-
 	Common::String command_com();
 
 	void explain(byte error);
diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp
index 9f006afec9..73a321af07 100644
--- a/engines/avalanche/gyro2.cpp
+++ b/engines/avalanche/gyro2.cpp
@@ -273,6 +273,11 @@ Gyro::~Gyro() {
 
 }
 
+Common::String Gyro::strf(int32 x) {
+	Common::String q = Common::String::format("%d", x);
+	return q;
+}
+
 void Gyro::newpointer(byte m) {
 	if (m == cmp)  return;
 	cmp = m;
@@ -339,11 +344,6 @@ void Gyro::blip() {
 	warning("STUB: Gyro::blip()");
 }
 
-Common::String Gyro::strf(int32 x) {
-	Common::String q = Common::String::format("%d", x);
-	return q;
-}
-
 void Gyro::shadow(int16 x1, int16 y1, int16 x2, int16 y2, byte hc, byte sc) {
 	warning("STUB: Gyro::shadow()");
 }
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index 50ae339987..7573581047 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -611,6 +611,8 @@ public:
 
 	~Gyro();
 
+	Common::String strf(int32 x);
+
 	void newpointer(byte m);
 
 	void wait();    /* makes hourglass */
@@ -633,8 +635,6 @@ public:
 
 	void blip();
 
-	Common::String strf(int32 x);
-
 	void shbox(int16 x1, int16 y1, int16 x2, int16 y2, Common::String t);
 
 	void newgame();