From c9331e3a8023a8cc5a3b0b6d8f6fd0b548495cd7 Mon Sep 17 00:00:00 2001 From: David Griffith Date: Thu, 14 May 2015 23:18:37 -0700 Subject: [PATCH] Fixed problem with background color not being set correctly. --- src/common/frotz.h | 1 + src/curses/ux_frotz.h | 2 +- src/curses/ux_init.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/frotz.h b/src/common/frotz.h index 21f2e3f..de23895 100644 --- a/src/common/frotz.h +++ b/src/common/frotz.h @@ -229,6 +229,7 @@ typedef struct { #define INTERP_APPLE_IIGS 10 #define INTERP_TANDY 11 +#define DEFAULT_COLOUR 1 #define BLACK_COLOUR 2 #define RED_COLOUR 3 #define GREEN_COLOUR 4 diff --git a/src/curses/ux_frotz.h b/src/curses/ux_frotz.h index bd155d8..ce225be 100644 --- a/src/curses/ux_frotz.h +++ b/src/curses/ux_frotz.h @@ -28,7 +28,7 @@ #define TANDY_DEF 0 #define OBJ_MOVE_DEF 0 #define OBJ_LOC_DEF 0 -#define BACKGROUND_DEF BLUE_COLOUR +#define BACKGROUND_DEF BLACK_COLOUR #define FOREGROUND_DEF WHITE_COLOUR #define HEIGHT_DEF -1 /* let curses figure it out */ #define CONTEXTLINES_DEF 0 diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c index 814d5dd..72a6ae2 100644 --- a/src/curses/ux_init.c +++ b/src/curses/ux_init.c @@ -235,7 +235,7 @@ void os_process_arguments (int argc, char *argv[]) case 'a': f_setup.attribute_assignment = 1; break; case 'A': f_setup.attribute_testing = 1; break; - case 'b': u_setup.background_color = atoi(zoptarg); + case 'b': u_setup.background_color = getcolor(zoptarg); u_setup.force_color = 1; u_setup.disable_color = 0; if ((u_setup.background_color < 2) || -- 2.34.1