Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
GLK: FROTZ: Cleanup of incorrect namespace comments
  • Loading branch information
dreammaster committed Jan 2, 2019
1 parent fd2dda4 commit b4c3df6
Show file tree
Hide file tree
Showing 21 changed files with 24 additions and 28 deletions.
2 changes: 1 addition & 1 deletion engines/glk/frotz/config.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/frotz.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/glk_interface.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/mem.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor_buffer.cpp
Expand Up @@ -188,5 +188,5 @@ void Processor::runtimeError(ErrorCode errNum) {
}
}

} // End of namespace Scott
} // End of namespace Frotz
} // End of namespace Glk
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor_input.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor_maths.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor_mem.cpp
Expand Up @@ -214,5 +214,5 @@ void Processor::memory_close(void) {
}
}

} // End of namespace Scott
} // End of namespace Frotz
} // End of namespace Glk
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor_objects.cpp
Expand Up @@ -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
12 changes: 3 additions & 9 deletions engines/glk/frotz/processor_screen.cpp
Expand Up @@ -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() {
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor_streams.cpp
Expand Up @@ -609,5 +609,5 @@ void Processor::z_verify() {
branch(checksum == h_checksum);
}

} // End of namespace Scott
} // End of namespace Frotz
} // End of namespace Glk
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor_table.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor_text.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor_variables.cpp
Expand Up @@ -195,5 +195,5 @@ void Processor::z_store() {
}
}

} // End of namespace Scott
} // End of namespace Frotz
} // End of namespace Glk
2 changes: 1 addition & 1 deletion engines/glk/frotz/processor_windows.cpp
Expand Up @@ -330,5 +330,5 @@ zword Processor::winarg2() {
return zargs[2];
}

} // End of namespace Scott
} // End of namespace Frotz
} // End of namespace Glk
2 changes: 1 addition & 1 deletion engines/glk/frotz/quetzal.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/screen.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/sound_folder.cpp
Expand Up @@ -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
2 changes: 1 addition & 1 deletion engines/glk/frotz/windows.cpp
Expand Up @@ -33,5 +33,5 @@ Window &Windows::operator[](uint idx) {
return _windows[idx];
}

} // End of namespace Scott
} // End of namespace Frotz
} // End of namespace Glk
2 changes: 2 additions & 0 deletions engines/glk/frotz/windows.h
Expand Up @@ -28,6 +28,8 @@
namespace Glk {
namespace Frotz {

#include "glk/windows.h"

/**
* Represents one of the virtual windows
*/
Expand Down

0 comments on commit b4c3df6

Please sign in to comment.