From f6896224324a388a140813dea18320b1900378fc Mon Sep 17 00:00:00 2001 From: David Griffith Date: Thu, 14 May 2015 23:11:51 -0700 Subject: [PATCH] Fixed problem with backgrounds not being set correctly. --- src/common/frotz.h | 1 + src/curses/ux_frotz.h | 2 +- src/curses/ux_init.c | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/common/frotz.h b/src/common/frotz.h index 405aeb8..6347ff0 100644 --- a/src/common/frotz.h +++ b/src/common/frotz.h @@ -231,6 +231,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 19855eb..91e69a6 100644 --- a/src/curses/ux_frotz.h +++ b/src/curses/ux_frotz.h @@ -22,7 +22,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 b11b195..c2e1dac 100644 --- a/src/curses/ux_init.c +++ b/src/curses/ux_init.c @@ -205,7 +205,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(optarg); + case 'b': u_setup.background_color = getcolor(optarg); u_setup.force_color = 1; u_setup.disable_color = 0; if ((u_setup.background_color < 2) || @@ -222,8 +222,6 @@ void os_process_arguments (int argc, char *argv[]) (u_setup.foreground_color > 9)) u_setup.foreground_color = -1; break; - - case 'F': u_setup.force_color = 1; u_setup.disable_color = 0; break; -- 2.34.1