X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Fconvert.h;h=0abdf93c5c48e5ee986a1b50cec5fef03963b26e;hp=354a6f12467b10755a8eddc02513496dea54eb45;hb=9680ca1ca361db0f75957ed8dbbf62811747de93;hpb=6a3c0962283d32bc6e5f6c47c929baf37ddc642f

diff --git a/pctb/convert.h b/pctb/convert.h
index 354a6f1..0abdf93 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -60,8 +60,9 @@ RgbImage *alloc_rgb_image(int w, int h);
 /*----- from structure.c -----*/
 
 void find_structure(const CanonImage *im, int *max_relevant_y_r);
+Rect find_sunshine_widget(void);
 
-void find_islandname(void);
+void find_islandname(RgbImage *ri);
 void check_correct_commodities(void);
 void read_screenshots(void);
 void read_one_screenshot(void);
@@ -87,6 +88,7 @@ void progress_spinner(const char *fmt, ...)      FMT(1,2);
 enum flags {
   ff_editcharset=     00001,
   ff_singlepage=      00002,
+  ff_testservers=     00004,
   
   ff_dict_fetch=      00010,
   ff_dict_submit=     00020,
@@ -94,11 +96,16 @@ enum flags {
   ffs_dict=           00070,
 
   ff_needisland=      00100,
-  ff_upload=          00200,
-  ffs_upload=         00300,
+  ff_printisland=     00200,
+  ff_upload=          00400,
+  ffs_printisland=    00300,
+  ffs_upload=         00500,
 };
 extern enum flags o_flags;
 
+extern const char *o_ocean, *o_pirate;
+extern int o_quiet;
+
 /*----- from pages.c -----*/
 
 void screenshot_startup(void);
@@ -112,7 +119,8 @@ extern CanonImage *page_images[MAX_PAGES];
 extern int npages;
 RgbImage *page0_rgbimage;
 
-extern char *ocean, *pirate;
+extern const char *ocean, *pirate;
+extern char *archipelago, *island;
 
 
 #endif /*CONVERT_H*/