diff options
| author | Paul Gilbert | 2018-11-14 19:55:14 -0800 |
|---|---|---|
| committer | Paul Gilbert | 2018-12-08 19:05:59 -0800 |
| commit | a1d355d0be8dfe0e3c1227a8f17ada609041ece4 (patch) | |
| tree | 19d7527d5e40ac39a902cec9a9b7bbef6c696cf4 | |
| parent | 7b1b3935b89e119d7a268521adbc39afc605e403 (diff) | |
| download | scummvm-rg350-a1d355d0be8dfe0e3c1227a8f17ada609041ece4.tar.gz scummvm-rg350-a1d355d0be8dfe0e3c1227a8f17ada609041ece4.tar.bz2 scummvm-rg350-a1d355d0be8dfe0e3c1227a8f17ada609041ece4.zip | |
GLK: FROTZ: Move ostream_* flags from GlkInterface to Processor
| -rw-r--r-- | engines/glk/frotz/glk_interface.cpp | 6 | ||||
| -rw-r--r-- | engines/glk/frotz/glk_interface.h | 8 | ||||
| -rw-r--r-- | engines/glk/frotz/processor.cpp | 3 | ||||
| -rw-r--r-- | engines/glk/frotz/processor.h | 6 |
4 files changed, 10 insertions, 13 deletions
diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp index b9652bce46..6a0d510d85 100644 --- a/engines/glk/frotz/glk_interface.cpp +++ b/engines/glk/frotz/glk_interface.cpp @@ -32,10 +32,8 @@ GlkInterface::GlkInterface(OSystem *syst, const GlkGameDescription &gameDesc) : curr_status_ht(0), mach_status_ht(0), gos_status(nullptr), gos_upper(nullptr), gos_lower(nullptr), gos_curwin(nullptr), gos_linepending(0), gos_linebuf(nullptr), gos_linewin(nullptr), gos_channel(nullptr), cwin(0), mwin(0), mouse_x(0), mouse_y(0), - menu_selected(0), ostream_screen(false), ostream_script(false), ostream_memory(false), - ostream_record(false), istream_replay(false), message(false), - enable_wrapping(false), enable_scripting(false), enable_scrolling(false), - enable_buffering(false), next_sample(0), next_volume(0), + menu_selected(0), enable_wrapping(false), enable_scripting(false), + enable_scrolling(false), enable_buffering(false), next_sample(0), next_volume(0), _soundLocked(false), _soundPlaying(false) { Common::fill(&statusline[0], &statusline[256], '\0'); } diff --git a/engines/glk/frotz/glk_interface.h b/engines/glk/frotz/glk_interface.h index 8bbdb735df..c18ebb8c59 100644 --- a/engines/glk/frotz/glk_interface.h +++ b/engines/glk/frotz/glk_interface.h @@ -81,14 +81,6 @@ public: int mouse_x; int menu_selected; - // IO streams - bool ostream_screen; - bool ostream_script; - bool ostream_memory; - bool ostream_record; - bool istream_replay; - bool message; - // Window attributes bool enable_wrapping; bool enable_scripting; diff --git a/engines/glk/frotz/processor.cpp b/engines/glk/frotz/processor.cpp index 442b0079fe..eaa7310fc7 100644 --- a/engines/glk/frotz/processor.cpp +++ b/engines/glk/frotz/processor.cpp @@ -137,7 +137,8 @@ Processor::Processor(OSystem *syst, const GlkGameDescription &gameDesc) : zargc(0), _decoded(nullptr), _encoded(nullptr), _resolution(0), _randomInterval(0), _randomCtr(0), first_restart(true), script_valid(false), _bufPos(0), _locked(false), _prevC('\0'), script_width(0), - sfp(nullptr), rfp(nullptr), pfp(nullptr) { + sfp(nullptr), rfp(nullptr), pfp(nullptr), ostream_screen(true), ostream_script(false), + ostream_memory(false), ostream_record(false), istream_replay(false), message(false) { static const Opcode OP0_OPCODES[16] = { &Processor::z_rtrue, &Processor::z_rfalse, diff --git a/engines/glk/frotz/processor.h b/engines/glk/frotz/processor.h index ddb264ca3f..1a1dfc5fe3 100644 --- a/engines/glk/frotz/processor.h +++ b/engines/glk/frotz/processor.h @@ -88,6 +88,12 @@ private: // Stream related fields int script_width; strid_t sfp, rfp, pfp; + bool ostream_screen; + bool ostream_script; + bool ostream_memory; + bool ostream_record; + bool istream_replay; + bool message; Common::FixedStack<Redirect, MAX_NESTING> _redirect; private: /** |