onboard ship island name horizontal trim

[ypp-sc-tools.main.git] / pctb / structure.c

diff --git a/pctb/structure.c b/pctb/structure.c
index 97cbb0739473e0e2fcdc5fb5609a973dd438c1c8..0bc3be1f5c5287172df9eb75d9b6b22f763bc717 100644 (file)
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -470,7 +470,7 @@ void analyse(FILE *tsv_output) {
     if (!rd)
       rd= ocr_init(text_h);
 
-    progress("OCRing page %d...",page);
+    progress("Scanning page %d...",page);
 
     for (tryrect= +cim->h; tryrect >= -cim->h; tryrect--) {
       find_commodity(tryrect, &thisr);
@@ -494,6 +494,7 @@ void analyse(FILE *tsv_output) {
       sysassert(!fflush(tsv_output));
     }
   }
+  progress("Commodity table scan complete.");
 }
 
 //static Rect islandnamer;
@@ -533,7 +534,7 @@ void find_islandname(void) {
 
   identify_rgbimage(ri, sunshiner, sunshine, "sunshine widget");
   
-  if (!memcmp(sunshine,"Ship ",5)) {
+  if (!memcmp(sunshine,"Vessel ",5)) {
     Rect islandnamer;
     
     islandnamer.tl.x= cim->w - 1034 +  885;
@@ -544,6 +545,9 @@ void find_islandname(void) {
     ADJUST_BOX(islandnamer,"o",5, 0,      MUST, tl,y,+1);
     ADJUST_BOX(islandnamer,"o",5, cim->h, MUST, br,y,-1);
 
+    ADJUST_BOX(islandnamer,"o",1, 0,      MUST, tl,x,+1);
+    ADJUST_BOX(islandnamer,"o",1, cim->w, MUST, br,x,-1);
+
     debug_rect("islandnamer",0, islandnamer);
 //    int larger_islandnamebry= islandnamer.tl.y + 25;
 //    MUST(islandnamer.br.y < larger_islandnamebry,