[Freeciv-Dev] Re: (brown color)7 patches to freeciv-1.11.4 (3rd try)

[Thue <thue@xxxxxxx>]

(Question to anyone who can answer): What is the downside of allocating a new 
color? Is there one?

-Thue
-------------
 ColorBrown.patch
        Extend freeciv's standard color set to include "brown" (really a reddish
        dark brown).
        Use this color (instead of COLOR_STD_CYAN) to denote foreign cities in
        the overview -- isolated cyan pixels are hard to distinguish from the
        green which denotes ground.
        Use this color (instead of COLOR_STD_RACE6) to display moderate
        pollution levels in city dialog boxes.

diff -rub freeciv-1.11.4.KIT/client/gui-gtk/citydlg.c 
freeciv-1.11.4/client/gui-gtk/citydlg.c
--- freeciv-1.11.4.KIT/client/gui-gtk/citydlg.c Mon Jul 10 03:31:59 2000
+++ freeciv-1.11.4/client/gui-gtk/citydlg.c     Thu Feb 22 00:48:23 2001
@@ -974,7 +974,7 @@
 
   col = COLOR_STD_BLACK;
   if (pcity->pollution > 0)
-    col = COLOR_STD_RACE6;
+    col = COLOR_STD_BROWN;
   if (pcity->pollution >= 10)
     col = COLOR_STD_RED;
 
diff -rub freeciv-1.11.4.KIT/client/gui-gtk/colors.c 
freeciv-1.11.4/client/gui-gtk/colors.c
--- freeciv-1.11.4.KIT/client/gui-gtk/colors.c  Wed Jul 14 11:23:06 1999
+++ freeciv-1.11.4/client/gui-gtk/colors.c      Fri Feb 23 02:48:48 2001
@@ -27,6 +27,7 @@
   {255,   0,   0},  /* Red */
   {255, 255,   0},  /* Yellow */
   {  0, 255, 200},  /* Cyan */
+  {160, 128,  64},  /* Brown(ish) */
   {  0, 200,   0},  /* Ground (green) */
   {  0,   0, 200},  /* Ocean (blue) */
   {128,   0,   0},  /* race0 */
diff -rub freeciv-1.11.4.KIT/client/gui-xaw/colors.c 
freeciv-1.11.4/client/gui-xaw/colors.c
--- freeciv-1.11.4.KIT/client/gui-xaw/colors.c  Mon Oct  4 13:36:16 1999
+++ freeciv-1.11.4/client/gui-xaw/colors.c      Fri Feb 23 02:47:41 2001
@@ -52,6 +52,7 @@
   {255,   0,   0},  /* Red */
   {255, 255,   0},  /* Yellow */
   {  0, 255, 200},  /* Cyan */
+  {160, 128,  64},  /* Brown(ish) */
   {  0, 200,   0},  /* Ground (green) */
   {  0,   0, 200},  /* Ocean (blue) */
   {128,   0,   0},  /* race0 */
diff -rub freeciv-1.11.4.KIT/client/include/colors_g.h 
freeciv-1.11.4/client/include/colors_g.h
--- freeciv-1.11.4.KIT/client/include/colors_g.h        Sun Sep 19 03:26:00 1999
+++ freeciv-1.11.4/client/include/colors_g.h    Thu Feb 22 00:47:50 2001
@@ -17,7 +17,7 @@
 
 enum color_std { 
   COLOR_STD_BLACK, COLOR_STD_WHITE, COLOR_STD_RED,
-  COLOR_STD_YELLOW, COLOR_STD_CYAN,
+  COLOR_STD_YELLOW, COLOR_STD_CYAN, COLOR_STD_BROWN,
   COLOR_STD_GROUND, COLOR_STD_OCEAN,
   COLOR_STD_RACE0, COLOR_STD_RACE1, COLOR_STD_RACE2,
   COLOR_STD_RACE3, COLOR_STD_RACE4, COLOR_STD_RACE5,
diff -rub freeciv-1.11.4.KIT/client/tilespec.c 
freeciv-1.11.4/client/tilespec.c
--- freeciv-1.11.4.KIT/client/tilespec.c        Mon Jul 10 01:49:04 2000
+++ freeciv-1.11.4/client/tilespec.c    Thu Feb 22 00:48:44 2001
@@ -1299,7 +1299,7 @@
     if(pcity->owner==game.player_idx)
       color=COLOR_STD_WHITE;
     else
-      color=COLOR_STD_CYAN;
+      color=COLOR_STD_BROWN;
   } else if ((punit=find_visible_unit(ptile))) {
     if(punit->owner==game.player_idx)
       color=COLOR_STD_YELLOW;