[Aptitude-svn-commit] r3599 - in branches/aptitude-0.3/aptitude: . src/mine

[Daniel Burrows]

Author: dburrows
Date: Sun Jul  3 19:37:31 2005
New Revision: 3599

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/mine/cmine.cc
Log:
Add support for adjusting the coloration of uncovered squares according to how many bombs adjoin them.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Jul  3 19:37:31 2005
@@ -1,4 +1,9 @@
 2005-07-03  Daniel Burrows  <dburrows@debian.org>
+	* src/mine/cmine.cc:
+
+	  Add and use support for adjusting the coloration of uncovered
+	  squares according to how many bombs adjoin them.  Make detonated
+	  mines bright red too.
 
 	* src/mine/cmine.cc:
 

Modified: branches/aptitude-0.3/aptitude/src/mine/cmine.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/mine/cmine.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/mine/cmine.cc	Sun Jul  3 19:37:31 2005
@@ -336,6 +336,11 @@
 
   table->connect_key_post("Confirm", &global_bindings, okbutton->pressed.make_slot());
 
+  easybutton->connect_key("Confirm", &global_bindings, okbutton->pressed.make_slot());
+  mediumbutton->connect_key("Confirm", &global_bindings, okbutton->pressed.make_slot());
+  hardbutton->connect_key("Confirm", &global_bindings, okbutton->pressed.make_slot());
+  custombutton->connect_key("Confirm", &global_bindings, okbutton->pressed.make_slot());
+
   vs_radiogroup *grp=new vs_radiogroup;
   grp->add_button(easybutton, 0);
   grp->add_button(mediumbutton, 1);
@@ -684,7 +689,12 @@
 	  else if(entry.adjacent_mines==0)
 	    ch=L'.';
 	  else
-	    ch=(L'0'+entry.adjacent_mines);
+	    {
+	      ch=(L'0'+entry.adjacent_mines);
+	      string stname("MineNumber");
+	      stname+=(char) '0'+entry.adjacent_mines;
+	      cur_st=get_style(string("MineNumber")+char('0'+entry.adjacent_mines));
+	    }
 	}
       else
 	{
@@ -702,14 +712,16 @@
 		  cur_st=get_style("MineBomb");
 		}
 	    }
-	  else if(entry.uncovered)
+	  else if(entry.uncovered || true)
 	    {
 	      if(entry.adjacent_mines==0)
 		ch=L'.';
 	      else
 		{
 		  ch=(L'0'+entry.adjacent_mines);
-		  cur_st=get_style("MineNumber");
+		  string stname("MineNumber");
+		  stname+=(char) '0'+entry.adjacent_mines;
+		  cur_st=get_style(string("MineNumber")+char('0'+entry.adjacent_mines));
 		}
 	    }
 	  else
@@ -862,8 +874,15 @@
 
   set_style("MineFlag", style_fg(COLOR_RED)+style_attrs_on(A_BOLD));
   set_style("MineBomb", style_fg(COLOR_RED)+style_attrs_on(A_BOLD));
-  set_style("MineDetonated", style_fg(COLOR_CYAN));
-  set_style("MineNumber", style_attrs_on(A_BOLD));
+  set_style("MineDetonated", style_fg(COLOR_RED)+style_attrs_on(A_BOLD));
+  set_style("MineNumber1", style_fg(COLOR_WHITE));
+  set_style("MineNumber2", style_fg(COLOR_GREEN));
+  set_style("MineNumber3", style_fg(COLOR_CYAN));
+  set_style("MineNumber4", style_fg(COLOR_MAGENTA)+style_attrs_on(A_BOLD));
+  set_style("MineNumber5", style_fg(COLOR_RED)+style_attrs_on(A_BOLD));
+  set_style("MineNumber6", style_attrs_on(A_BOLD)+style_fg(COLOR_CYAN));
+  set_style("MineNumber7", style_attrs_on(A_BOLD)+style_fg(COLOR_GREEN));
+  set_style("MineNumber8", style_attrs_on(A_BOLD));
   set_style("MineBorder", style_attrs_on(A_BOLD));
 
   global_bindings.set("MineUncoverSweepSquare", key(KEY_ENTER, true));