From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 6 Mar 2019 12:59:54 +0000 (+0000)
Subject: introduce and use miscpscolour nfc
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=dfa411608a7284a7916d00b1c1a1b4675e2c1677;p=pandemic-rising-tide.git

introduce and use miscpscolour nfc
---

diff --git a/generate-board b/generate-board
index 9dd9353..4a971e2 100755
--- a/generate-board
+++ b/generate-board
@@ -418,6 +418,11 @@ sub facepscolour ($) {
   $xopts =~ m/W/ ? '1 setgray' : lighterpscolour($colourname, 0.75);
 }
 
+sub miscpscolour ($) {
+  my ($colourname) = @_;
+  pscolour($c{Colours}{$colourname});
+}
+
 sub fill_faces() {
   o("clippath ", facepscolour('land'), " fill\n");
   foreach my $rr (values %region) {
@@ -583,7 +588,7 @@ sub water_cubes($){
     o("          $s  0  rlineto\n");
     o("           0 $s  rlineto\n");
     o("         -$s  0  rlineto  closepath\n");
-    o("  gsave ", pscolour($c{Colours}{cube}), " fill grestore\n");
+    o("  gsave ", miscpscolour('cube'), " fill grestore\n");
     o("  gsave ", '0 setgray ', $cube_lw,
       " setlinewidth stroke grestore \n");
   }
@@ -613,7 +618,7 @@ sub decks(){
   o("  } bind def");
   o("  $lw setlinewidth 1 setgray\n");
   o("  gsave 401 44 translate deckpairpathx stroke grestore");
-  o("  $lw setlinewidth ",pscolour($c{Colours}{dykefail}),"\n");
+  o("  $lw setlinewidth ",miscpscolour('dykefail'),"\n");
   o("  gsave 242 1363 translate 90 rotate deckpairpathx stroke grestore");
 }
 
@@ -634,7 +639,7 @@ sub sea_track(){
   o("    ",psvec($pos[0])," moveto ",psvec($pos[-1])," lineto stroke\n");
   for my $pos (@pos) {
     token_circle("SL", $pos,
-		 pscolour($c{Colours}{cube}),
+		 miscpscolour('cube'),
 		 $linecolour);
   }
   my $last = 0;
@@ -713,7 +718,7 @@ sub dykes(){
   o("    newpath @t0 moveto\n");
   o("            @t1 lineto\n");
   o("            @t2 lineto closepath\n");
-  o("    gsave ",pscolour($c{Colours}{dykeinit})," fill grestore\n");
+  o("    gsave ",miscpscolour('dykeinit')," fill grestore\n");
   o("    gsave 0 setgray $lw setlinewidth stroke grestore\n");
   o("  } bind def\n");
   foreach my $rr (values %region) {
@@ -796,7 +801,7 @@ sub hs_initial () {
   hs_initial_1('yellow',  1,1, 'up to 4', '', sub {
     o("    newpath dykepath\n");
     o("    gsave 0.50 setgray fill grestore\n");
-    o("    gsave ",pscolour($c{Colours}{dykehsadd})," fill grestore\n");
+    o("    gsave ",miscpscolour('dykehsadd')," fill grestore\n");
   });
 }