From b4c3df62e32e0c25001b8149bbd8311b54f953f0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 1 Jan 2019 19:04:12 -0800
Subject: GLK: FROTZ: Cleanup of incorrect namespace comments

---
 engines/glk/frotz/config.cpp              |  2 +-
 engines/glk/frotz/frotz.cpp               |  2 +-
 engines/glk/frotz/glk_interface.cpp       |  2 +-
 engines/glk/frotz/mem.cpp                 |  2 +-
 engines/glk/frotz/processor.cpp           |  2 +-
 engines/glk/frotz/processor_buffer.cpp    |  2 +-
 engines/glk/frotz/processor_input.cpp     |  2 +-
 engines/glk/frotz/processor_maths.cpp     |  2 +-
 engines/glk/frotz/processor_mem.cpp       |  2 +-
 engines/glk/frotz/processor_objects.cpp   |  2 +-
 engines/glk/frotz/processor_screen.cpp    | 12 +++---------
 engines/glk/frotz/processor_streams.cpp   |  2 +-
 engines/glk/frotz/processor_table.cpp     |  2 +-
 engines/glk/frotz/processor_text.cpp      |  2 +-
 engines/glk/frotz/processor_variables.cpp |  2 +-
 engines/glk/frotz/processor_windows.cpp   |  2 +-
 engines/glk/frotz/quetzal.cpp             |  2 +-
 engines/glk/frotz/screen.cpp              |  2 +-
 engines/glk/frotz/sound_folder.cpp        |  2 +-
 engines/glk/frotz/windows.cpp             |  2 +-
 engines/glk/frotz/windows.h               |  2 ++
 21 files changed, 24 insertions(+), 28 deletions(-)

(limited to 'engines/glk')

diff --git a/engines/glk/frotz/config.cpp b/engines/glk/frotz/config.cpp
index aff46792d3..f98e1e83ab 100644
--- a/engines/glk/frotz/config.cpp
+++ b/engines/glk/frotz/config.cpp
@@ -168,5 +168,5 @@ bool UserOptions::isInfocom() const {
 	return g_vm->getOptions() & OPTION_INFOCOM;
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/frotz.cpp b/engines/glk/frotz/frotz.cpp
index c2341d4026..e837f65554 100644
--- a/engines/glk/frotz/frotz.cpp
+++ b/engines/glk/frotz/frotz.cpp
@@ -118,5 +118,5 @@ Common::Error Frotz::loadGameData(strid_t file) {
 	return Common::kNoError;
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp
index 514435aaf0..0f08799fc9 100644
--- a/engines/glk/frotz/glk_interface.cpp
+++ b/engines/glk/frotz/glk_interface.cpp
@@ -606,5 +606,5 @@ zchar GlkInterface::os_read_line(int max, zchar *buf, int timeout, int width, in
 	return ZC_RETURN;
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/mem.cpp b/engines/glk/frotz/mem.cpp
index 0665eea86f..227b67358d 100644
--- a/engines/glk/frotz/mem.cpp
+++ b/engines/glk/frotz/mem.cpp
@@ -303,5 +303,5 @@ void Mem::mem_undiff(zbyte *diff, long diff_length, zbyte *dest) {
 	}
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor.cpp b/engines/glk/frotz/processor.cpp
index 9fcb3b2641..b9631c85e4 100644
--- a/engines/glk/frotz/processor.cpp
+++ b/engines/glk/frotz/processor.cpp
@@ -662,5 +662,5 @@ void Processor::z_restore_undo(void) {
 	store((zword)restore_undo());
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_buffer.cpp b/engines/glk/frotz/processor_buffer.cpp
index 8b9e4112b9..65f1fdacb5 100644
--- a/engines/glk/frotz/processor_buffer.cpp
+++ b/engines/glk/frotz/processor_buffer.cpp
@@ -188,5 +188,5 @@ void Processor::runtimeError(ErrorCode errNum) {
 	}
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_input.cpp b/engines/glk/frotz/processor_input.cpp
index 91c86c8b03..f9dc66f10b 100644
--- a/engines/glk/frotz/processor_input.cpp
+++ b/engines/glk/frotz/processor_input.cpp
@@ -219,5 +219,5 @@ void Processor::z_read_mouse() {
 	storew((zword)(zargs[0] + 6), menu_selected);	// menu selection
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_maths.cpp b/engines/glk/frotz/processor_maths.cpp
index 79ff65c5f4..635a9b596c 100644
--- a/engines/glk/frotz/processor_maths.cpp
+++ b/engines/glk/frotz/processor_maths.cpp
@@ -101,5 +101,5 @@ void Processor::z_test() {
 	branch((zargs[0] & zargs[1]) == zargs[1]);
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_mem.cpp b/engines/glk/frotz/processor_mem.cpp
index dec7520084..e3bd59660f 100644
--- a/engines/glk/frotz/processor_mem.cpp
+++ b/engines/glk/frotz/processor_mem.cpp
@@ -214,5 +214,5 @@ void Processor::memory_close(void) {
 	}
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_objects.cpp b/engines/glk/frotz/processor_objects.cpp
index ab136f3c40..9e71ba96f2 100644
--- a/engines/glk/frotz/processor_objects.cpp
+++ b/engines/glk/frotz/processor_objects.cpp
@@ -728,5 +728,5 @@ void Processor::z_test_attr() {
 	branch(value & (0x80 >> (zargs[1] & 7)));
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_screen.cpp b/engines/glk/frotz/processor_screen.cpp
index 60672c85ab..da45fa16a3 100644
--- a/engines/glk/frotz/processor_screen.cpp
+++ b/engines/glk/frotz/processor_screen.cpp
@@ -190,11 +190,7 @@ void Processor::z_buffer_mode() {
 }
 
 void Processor::z_buffer_screen() {
-#ifdef TODO
-store((zword)os_buffer_screen((zargs[0] == (zword)-1) ? -1 : zargs[0]));
-#else
 	store(0);
-#endif
 }
 
 void Processor::z_erase_line() {
@@ -209,8 +205,7 @@ void Processor::z_erase_line() {
 
 void Processor::z_erase_window() {
 	short w = zargs[0];
-	if (w == -2)
-	{
+	if (w == -2) {
 		if (_wp._upper) {
 			glk_set_window(_wp._upper);
 #ifdef GARGLK
@@ -221,8 +216,7 @@ void Processor::z_erase_window() {
 		}
 		glk_window_clear(_wp._lower);
 	}
-	if (w == -1)
-	{
+	if (w == -1) {
 		if (_wp._upper) {
 			glk_set_window(_wp._upper);
 #ifdef GARGLK
@@ -588,5 +582,5 @@ void Processor::z_split_window() {
 	split_window(zargs[0]);
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_streams.cpp b/engines/glk/frotz/processor_streams.cpp
index 187220bff6..067708fb23 100644
--- a/engines/glk/frotz/processor_streams.cpp
+++ b/engines/glk/frotz/processor_streams.cpp
@@ -609,5 +609,5 @@ void Processor::z_verify() {
 	branch(checksum == h_checksum);
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_table.cpp b/engines/glk/frotz/processor_table.cpp
index b926725871..c3c994a30c 100644
--- a/engines/glk/frotz/processor_table.cpp
+++ b/engines/glk/frotz/processor_table.cpp
@@ -116,5 +116,5 @@ void Processor::z_storew() {
 	storew((zword)(zargs[0] + 2 * zargs[1]), zargs[2]);
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_text.cpp b/engines/glk/frotz/processor_text.cpp
index 2b82f29e3c..1f3d6b3e44 100644
--- a/engines/glk/frotz/processor_text.cpp
+++ b/engines/glk/frotz/processor_text.cpp
@@ -906,5 +906,5 @@ void Processor::z_tokenise() {
 	tokenise_line(zargs[0], zargs[1], zargs[2], zargs[3] != 0);
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_variables.cpp b/engines/glk/frotz/processor_variables.cpp
index 6e6a19191e..875572d8da 100644
--- a/engines/glk/frotz/processor_variables.cpp
+++ b/engines/glk/frotz/processor_variables.cpp
@@ -195,5 +195,5 @@ void Processor::z_store() {
 	}
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/processor_windows.cpp b/engines/glk/frotz/processor_windows.cpp
index ad16bbafe6..7b042d9c93 100644
--- a/engines/glk/frotz/processor_windows.cpp
+++ b/engines/glk/frotz/processor_windows.cpp
@@ -330,5 +330,5 @@ zword Processor::winarg2() {
 	return zargs[2];
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/quetzal.cpp b/engines/glk/frotz/quetzal.cpp
index 11fc3f4a26..53de2933e5 100644
--- a/engines/glk/frotz/quetzal.cpp
+++ b/engines/glk/frotz/quetzal.cpp
@@ -490,5 +490,5 @@ int Quetzal::restore(Common::SeekableReadStream *svf, Processor *proc) {
 	return (progress == GOT_ALL ? 2 : fatal);
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/screen.cpp b/engines/glk/frotz/screen.cpp
index 8bdfafd879..d843528cc4 100644
--- a/engines/glk/frotz/screen.cpp
+++ b/engines/glk/frotz/screen.cpp
@@ -93,5 +93,5 @@ void BitmapFont::drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint
 	}
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/sound_folder.cpp b/engines/glk/frotz/sound_folder.cpp
index fd99b0b2b1..761978eaea 100644
--- a/engines/glk/frotz/sound_folder.cpp
+++ b/engines/glk/frotz/sound_folder.cpp
@@ -142,5 +142,5 @@ Common::SeekableReadStream *SoundZip::createReadStreamForMember(const Common::St
 	return _zip->createReadStreamForMember(_filenames[name]);
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/windows.cpp b/engines/glk/frotz/windows.cpp
index b49c6d1413..e30f61ebdf 100644
--- a/engines/glk/frotz/windows.cpp
+++ b/engines/glk/frotz/windows.cpp
@@ -33,5 +33,5 @@ Window &Windows::operator[](uint idx) {
 	return _windows[idx];
 }
 
-} // End of namespace Scott
+} // End of namespace Frotz
 } // End of namespace Glk
diff --git a/engines/glk/frotz/windows.h b/engines/glk/frotz/windows.h
index ef300fbb4c..e685c4faf4 100644
--- a/engines/glk/frotz/windows.h
+++ b/engines/glk/frotz/windows.h
@@ -28,6 +28,8 @@
 namespace Glk {
 namespace Frotz {
 
+#include "glk/windows.h"
+
 /**
  * Represents one of the virtual windows
  */
-- 
cgit v1.2.3