Fixed problem with background color not being set correctly.

diff --git a/src/common/frotz.h b/src/common/frotz.h
index 21f2e3f4812570d591427683910bf4c9dfaca656..de23895c771166bafe635f02a2ed88ca6a7f3b62 100644 (file)
--- 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 bd155d8f9f427c6e5e3eb767cd0acf6ba7de5231..ce225be908682d5989f12ef8e6511bb4843cadc5 100644 (file)
--- 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 814d5dda0811c29023e4da008077a2c589c8060b..72a6ae22524287c1f5e7a1d0c4c92382a962a2e9 100644 (file)
--- 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) ||