From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 Mar 2019 15:42:30 +0000 (+0000)
Subject: break one one_hs
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=37ba1ab104f53c944794fe91a95ce40d190a4fed;p=pandemic-rising-tide.git

break one one_hs
---

diff --git a/generate-board b/generate-board
index 8171138..1930230 100755
--- a/generate-board
+++ b/generate-board
@@ -388,10 +388,23 @@ sub edge_faces() {
   } values %region);
 }
 
+our $hs_sz = 17 * MM2PT;
+our $hs_lw = 3;
+
+sub one_hs ($$) {
+  my ($colour, $hspos) = @_;
+  o(sprintf <<END
+   %% HS
+   newpath %s %s %f 0 360 arc closepath gsave fill grestore
+   0 setgray $hs_lw setlinewidth stroke
+END
+	, pscolour($colour,
+		   sub { $_ = 0.75 * $_ foreach @_ }),
+	psvec($hspos), $hs_sz/2);
+}
+
 sub label_faces() {
   my $sz = 18;
-  my $hs_sz = 17 * MM2PT;
-  my $hs_lw = 3;
   my $shadow = $sz * 0.1;
   o("  /Helvetica-Bold findfont  $sz scalefont setfont\n");
   my %hs = map { $_ => 1 } @{ $c{HS} };
@@ -405,14 +418,7 @@ sub label_faces() {
 		    ( $rr->{Colour} eq 'green' ? 0.25 : 0.65 ));
       my $hspos = $pos - mkvec(0, $sz * @$words + $hs_sz/2 + $hs_lw
 			       + $hs_sz*0.15);
-      o(sprintf <<END
-   %% HS
-   newpath %s %s %f 0 360 arc closepath gsave fill grestore
-   0 setgray $hs_lw setlinewidth stroke
-END
-	, pscolour($c{Colours}{$rr->{Colour}},
-		   sub { $_ = 0.75 * $_ foreach @_ }),
-	psvec($hspos), $hs_sz/2);
+      one_hs($c{Colours}{$rr->{Colour}}, $hspos);
     }
     # xxx water cubes
     o("  /words {\n");