From 19a9b9aa31cad3920bc258ebe79d1e1c9a7b537c Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 7 May 2019 20:18:30 +1000 Subject: GLK: HUGO: heglk fields & initialization --- engines/glk/hugo/heglk.cpp | 1 + engines/glk/hugo/hugo.cpp | 4 +++- engines/glk/hugo/hugo.h | 6 ++++++ engines/glk/hugo/hugo_types.h | 15 ++++++++++++++- 4 files changed, 24 insertions(+), 2 deletions(-) (limited to 'engines/glk/hugo') diff --git a/engines/glk/hugo/heglk.cpp b/engines/glk/hugo/heglk.cpp index 1dd0935982..8b56f32de0 100644 --- a/engines/glk/hugo/heglk.cpp +++ b/engines/glk/hugo/heglk.cpp @@ -45,6 +45,7 @@ void Hugo::hugo_init_screen() { } void Hugo::hugo_cleanup_screen() { + // No implementation } void Hugo::hugo_settextwindow(int left, int top, int right, int bottom) { diff --git a/engines/glk/hugo/hugo.cpp b/engines/glk/hugo/hugo.cpp index 7884bc43e0..3f63d3b6b2 100644 --- a/engines/glk/hugo/hugo.cpp +++ b/engines/glk/hugo/hugo.cpp @@ -40,7 +40,9 @@ Hugo::Hugo(OSystem *syst, const GlkGameDescription &gameDesc) : GlkAPI(syst, gam physical_windowwidth(0), physical_windowheight(0), physical_windowtop(0), physical_windowleft(0), physical_windowbottom(0), physical_windowright(0), inwindow(0), charwidth(0), lineheight(0), current_text_x(0), current_text_y(0), - undoptr(0), undoturn(0), undoinvalid(0), undorecord(0) { + undoptr(0), undoturn(0), undoinvalid(0), undorecord(0), + in_valid_window(false), glk_fcolor(DEF_FCOLOR), glk_bgcolor(DEF_BGCOLOR), + mainwin_bgcolor(0), glk_current_font(0), just_cleared_screen(false) { #if !defined (COMPILE_V25) Common::fill(&context_command[0][0], &context_command[MAX_CONTEXT_COMMANDS][64], 0); context_commands = 0; diff --git a/engines/glk/hugo/hugo.h b/engines/glk/hugo/hugo.h index 15d171173f..f94931f653 100644 --- a/engines/glk/hugo/hugo.h +++ b/engines/glk/hugo/hugo.h @@ -105,6 +105,12 @@ private: int undoturn; char undoinvalid; char undorecord; + + bool in_valid_window; + int glk_fcolor, glk_bgcolor; + int mainwin_bgcolor; + int glk_current_font; + bool just_cleared_screen; private: /** * \defgroup heglk diff --git a/engines/glk/hugo/hugo_types.h b/engines/glk/hugo/hugo_types.h index 3c06293dff..8082842cc4 100644 --- a/engines/glk/hugo/hugo_types.h +++ b/engines/glk/hugo/hugo_types.h @@ -28,10 +28,23 @@ namespace Glk { namespace Hugo { -#define HUGO_FILE strid_t #define MAX_CONTEXT_COMMANDS 32 #define MAXBUFFER 255 #define MAXUNDO 1024 +#define CHARWIDTH 1 + +#define HUGO_FILE strid_t +#define MAXPATH 256 +#define MAXFILENAME 256 +#define MAXDRIVE 256 +#define MAXDIR 256 +#define MAXEXT 256 + +#define DEF_PRN "" +#define DEF_FCOLOR 0 +#define DEF_BGCOLOR 15 +#define DEF_SLFCOLOR 15 +#define DEF_SLBGCOLOR 1 /** * Library/engine globals -- cgit v1.2.3