some updates to curses

Tangles updates

include/flag.h

@@ -322,10 +322,8 @@ struct instance_flags {
 #endif
 #endif
     uchar bouldersym; /* symbol for boulder display */
-#ifdef TTY_GRAPHICS
-    char prevmsg_window; /* type of old message window to use */
-#endif
 #if defined(TTY_GRAPHICS) || defined(CURSES_GRAPHICS)
+    char prevmsg_window; /* type of old message window to use */
     boolean extmenu;     /* extended commands use menu interface */
 #endif
 #ifdef MFLOPPY

include/wincurs.h

@@ -259,9 +259,6 @@ extern void curses_del_menu(winid wid);
 
 extern void curses_status_init(void);
 extern void curses_status_update(int, genericptr_t, int, int, int, unsigned long *);
-/* extern attr_t curses_color_attr(int nh_color, int bg_color); */
-/* extern void curses_update_stats(void); */
-/* extern void curses_decrement_highlight(void); */
 
 /* cursinvt.c */
 

src/options.c

@@ -106,7 +106,7 @@ static struct Bool_Opt {
 #endif
     { "clicklook", &iflags.clicklook, FALSE, SET_IN_GAME },
     { "cmdassist", &iflags.cmdassist, TRUE, SET_IN_GAME },
-#if defined(MICRO) || defined(WIN32)
+#if defined(MICRO) || defined(WIN32) || defined(CURSES_GRAPHICS)
     { "color", &iflags.wc_color, TRUE, SET_IN_GAME }, /*WC*/
 #else /* systems that support multiple terminals, many monochrome */
     { "color", &iflags.wc_color, FALSE, SET_IN_GAME }, /*WC*/