mention that screenshots file must be noraw

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

diff --git a/pctb/structure.c b/pctb/structure.c
index 200b86ea43c28b5e3a0bd58a5f299be8ed2be941..94c6b42aa6e84f2c9b5b69d41f26444aaecfcb94 100644 (file)
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -387,7 +387,7 @@ static void file_read_image_ppm(FILE *f) {
   if (!(inpam.maxval == 255 &&
        inpam.bytes_per_sample == 1 &&
        inpam.format == RPPM_FORMAT))
-    fatal("PNM screenshot(s) file must be 8bpp 1 byte per sample RGB");
+    fatal("PNM screenshot(s) file must be 8bpp 1 byte-per-sample RGB raw");
 
   CANONICALISE_IMAGE(im, inpam.width, inpam.height, {
     int r= fread(&rgb_buf,1,3,f);
@@ -671,7 +671,7 @@ void find_islandname(RgbImage *ri) {
       }
 
     identify_rgbimage(ri, islandnamer, archisland, "island");
-  } else {
+  } else if (!strcmp(sunshine,"Land - Ahoy")) {
     Rect islandnamer;
 
     islandnamer.tl.x= (sunshiner.tl.x + sunshiner.br.x) / 2;
@@ -757,6 +757,10 @@ void find_islandname(RgbImage *ri) {
     islandnamer.br.x= p.x;
 
     identify_rgbimage(ri, islandnamer, archisland, "island");
+  } else {
+
+    MUST(!"sunshine shows ship or ahoy", MS(sunshine) );
+
   }
 
   char *delim= strstr(archisland," - ");