GLK: FROTZ: Removal of method stubs that are now implemented

6 files changed, 12 insertions, 21 deletions

diff --git a/engines/gargoyle/frotz/frotz_types.h b/engines/gargoyle/frotz/frotz_types.h
index 302cc43b74..2b33fbddda 100644
--- a/engines/gargoyle/frotz/frotz_types.h
+++ b/engines/gargoyle/frotz/frotz_types.h
@@ -199,12 +199,6 @@ enum FontStyle {
 #define BEEP_HIGH       1
 #define BEEP_LOW        2
 
-/*** Constants for os_restart_game */
-
-#define RESTART_BEGIN 0
-#define RESTART_WPROP_SET 1
-#define RESTART_END 2
-
 /*** Constants for os_menu */
 
 #define MENU_NEW 0
diff --git a/engines/gargoyle/frotz/glk_interface.h b/engines/gargoyle/frotz/glk_interface.h
index f02fa0dd8c..161a1f3a41 100644
--- a/engines/gargoyle/frotz/glk_interface.h
+++ b/engines/gargoyle/frotz/glk_interface.h
@@ -36,6 +36,13 @@ enum SoundEffect {
 	EFFECT_FINISH_WITH = 4
 };
 
+enum RestartAction {
+	RESTART_BEGIN = 0,
+	RESTART_WPROP_SET = 1,
+	RESTART_END = 2
+};
+
+
 /**
  * Implements an intermediate interface on top of the GLK layer, providing screen
  * and sound effect handling
@@ -134,6 +141,11 @@ protected:
 	void packspaces(zchar *src, zchar *dst);
 
 	void smartstatusline();
+
+	/**
+	 * Called during game restarts
+	 */
+	void os_restart_game(RestartAction) {}
 public:
 	/**
 	 * Constructor
diff --git a/engines/gargoyle/frotz/processor_objects.cpp b/engines/gargoyle/frotz/processor_objects.cpp
index 3d2b17162d..986bf879d0 100644
--- a/engines/gargoyle/frotz/processor_objects.cpp
+++ b/engines/gargoyle/frotz/processor_objects.cpp
@@ -25,9 +25,6 @@
 namespace Gargoyle {
 namespace Frotz {
 
-// TODO: Method stubs to implement
-static void new_line() {}
-
 #define MAX_OBJECT 2000
 
 enum O1 {
diff --git a/engines/gargoyle/frotz/processor_screen.cpp b/engines/gargoyle/frotz/processor_screen.cpp
index 5b3b8cb379..27d3cda088 100644
--- a/engines/gargoyle/frotz/processor_screen.cpp
+++ b/engines/gargoyle/frotz/processor_screen.cpp
@@ -25,11 +25,6 @@
 namespace Gargoyle {
 namespace Frotz {
 
-// TODO: Method stubs to implement
-static void storew(zword, zword) {}
-static void print_char(zchar) {}
-
-
 void Processor::screen_char(zchar c) {
 	// TODO
 }
diff --git a/engines/gargoyle/frotz/processor_streams.cpp b/engines/gargoyle/frotz/processor_streams.cpp
index a5360959f2..3f35c1f4ca 100644
--- a/engines/gargoyle/frotz/processor_streams.cpp
+++ b/engines/gargoyle/frotz/processor_streams.cpp
@@ -28,8 +28,6 @@ namespace Frotz {
 // TODO: Implement method stubs
 static void os_scrollback_char(zchar) {}
 static void os_scrollback_erase(zword) {}
-static void script_open() {}
-static void script_close() {}
 static void script_mssg_on() {}
 static void script_mssg_off() {}
 static void script_char(zchar) {}
@@ -51,7 +49,6 @@ static void record_open() {}
 static void record_close() {}
 static void record_write_key(zchar) {}
 static void record_write_input(zchar *, zchar) {}
-static void os_restart_game(zword) {}
 static void restart_header() {}
 
 
diff --git a/engines/gargoyle/frotz/processor_variables.cpp b/engines/gargoyle/frotz/processor_variables.cpp
index 24bbd28fe3..19a40b9088 100644
--- a/engines/gargoyle/frotz/processor_variables.cpp
+++ b/engines/gargoyle/frotz/processor_variables.cpp
@@ -25,10 +25,6 @@
 namespace Gargoyle {
 namespace Frotz {
 
-// TODO: Replace method stubs
-static void storew(zword, zword) {}
-
-
 void Processor::z_dec() {
 	zword value;