X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fstructure.c;h=a49fe0fd7e91782d6d1f68254ac6974e74097e87;hb=97d26c012a638833535a5e1c98d287101b220887;hp=8aae1c4ac853998acf2de388e60af4d1065d040f;hpb=7f9df3a472dda7008366c3fdf865adeb3467b66b;p=ypp-sc-tools.web-live.git diff --git a/yarrg/structure.c b/yarrg/structure.c index 8aae1c4..a49fe0f 100644 --- a/yarrg/structure.c +++ b/yarrg/structure.c @@ -479,6 +479,19 @@ void check_correct_commodities(void) { "??____X_____?_X_?X__?X_______________________", "???__?_______?__?___?_______________________?", }; + static const char *all_fuzzy[]= { + "???___________________________________???", + "??_______???___X__X____________________??", + "?_______????__?X_?X_____XXXXXXXXXXX_____?", + "________?????_?X_?X______XXXXXXXXX_______", + "________?????_?X_?X_______XXXXXXX________", + "_______??????_?X_?X________XXXXX_________", + "_______??_?????X_?X_________XXX__________", + "______??XXXXX??X_?X__________X___________", + "?_____?????????X_?X______________________", + "??___???____???X_?X______________________", + "???__??_____???__?______________________?", + }; #define COMMOD_SELECTOR_MATCHES(all) \ commod_selector_matches(search, all, \ @@ -486,7 +499,8 @@ void check_correct_commodities(void) { strlen((all)[0])) if (!(COMMOD_SELECTOR_MATCHES(all_small) || - COMMOD_SELECTOR_MATCHES(all_big))) + COMMOD_SELECTOR_MATCHES(all_big) || + COMMOD_SELECTOR_MATCHES(all_fuzzy))) fatal("Commodities selector not set to `All'."); } @@ -1038,7 +1052,7 @@ void check_pager_motion(int first, int stop) { if (count <= 1) return; /* only one page */ double firstheight= PH(first); - double max= count>2 ? firstheight / (count-2) : 0; + double max= count>2 ? firstheight / (count-2) : 1e6; double min= firstheight / (count-1); max *= 1.1; min /= 1.1;