From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 Mar 2019 16:16:52 +0000 (+0000)
Subject: break out token_circle
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=f205075ada9eb45d15f232869d8c8c314fdbb7a2;p=pandemic-rising-tide.git

break out token_circle
---

diff --git a/generate-board b/generate-board
index 6f18fde..8f5c6c1 100755
--- a/generate-board
+++ b/generate-board
@@ -392,16 +392,23 @@ sub edge_faces() {
 our $hs_sz = 17 * MM2PT;
 our $hs_lw = 3;
 
+sub token_circle ($$$$) {
+  my ($what, $pos, $fillcolour, $edgecolour) = @_;
+  o(sprintf <<END, $what, $fillcolour, psvec($pos), $hs_sz/2, $edgecolour);
+   %% %s
+   newpath %s
+     %s %f 0 360 arc closepath gsave fill grestore
+     %s $hs_lw setlinewidth stroke
+END
+}
+
 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($c{Colours}{$colour},
-		   sub { $_ = 0.75 * $_ foreach @_ }),
-	psvec($hspos), $hs_sz/2);
+  token_circle("HS - $colour",
+	       $hspos,
+	       pscolour($c{Colours}{$colour},
+			sub { $_ = 0.75 * $_ foreach @_ }),
+	       '0 setgray');
 }
 
 sub label_faces() {