From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 25 Jul 2010 14:10:38 +0000 (+0100)
Subject: use vessel and other icons from info_cache
X-Git-Tag: 6.6.0^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=686285532be6809aade725d6b4c01f9d56826f7e

use vessel and other icons from info_cache
---

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 092e8da..33df7f8 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -304,14 +304,16 @@ proc vesselclasses-init {} {
 }
 
 proc load-icon {icon} {
-    image create bitmap icon/$icon -file icons/$icon.xbm
+    global info_cache
+    image create bitmap icon/$icon -file $info_cache/$icon.xbm
 }
 
 proc load-icon-combine {args} {
+    global info_cache
     set cmd {}
     set delim "pnmcat -lr "
     foreach icon $args {
-	append cmd $delim " <(xbmtopbm icons/$icon.xbm)"
+	append cmd $delim " <(xbmtopbm $info_cache/$icon.xbm)"
 	set delim " <(pbmmake -white 1 1)"
     }
     append cmd " | pbmtoxbm"