[rogueclone-cvs] rogue/src room.c,1.6,1.7

[<mle...@us...>]

Update of /cvsroot/rogueclone/rogue/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26109

Modified Files:
	room.c 
Log Message:
fixed inconsistent screen attributes when changing color option

Index: room.c
===================================================================
RCS file: /cvsroot/rogueclone/rogue/src/room.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** room.c	16 Feb 2004 01:01:46 -0000	1.6
--- room.c	17 Feb 2004 23:58:56 -0000	1.7
***************
*** 56,59 ****
--- 56,63 ----
  extern char *login_name, *fruit, *press_space;
  
+ /* don't modify use_colors until entire screen is redrawn, otherwise
+  * some lines are displayed in color and others in black & white */
+ static boolean color_kludge;
+ 
  #define NOPTS 7
  
***************
*** 80,84 ****
  	{
  		"Play in color (\"color\"): ",
! 		1, (char **) 0, &use_color, 0, 1
  	},
  	{
--- 84,88 ----
  	{
  		"Play in color (\"color\"): ",
! 		1, (char **) 0, &color_kludge, 0, 1
  	},
  	{
***************
*** 92,96 ****
  	{
  		"Fruit (\"fruit\"): ",
! 		0, &fruit, (boolean *) 0, 1, 0
  	}
  };
--- 96,100 ----
  	{
  		"Fruit (\"fruit\"): ",
! 		0, &fruit, (boolean *) 0, 0, 0
  	}
  };
***************
*** 691,694 ****
--- 695,700 ----
  	char buf[MAX_OPT_LEN + 2];
  
+ 	color_kludge = use_color;
+ 
  	for (i = 0; i < NOPTS+1; i++) {
  		for (j = 0; j < DCOLS; j++) {
***************
*** 787,790 ****
--- 793,798 ----
  		}
  	}
+ 	
+ 	use_color = color_kludge;
  
  	if (need_regen) {