mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-17 17:12:39 -05:00
puzzles: resync with Simon's upstream e00cb46 from 25 Sep 2025.
Notably, this enables "Group". This also includes some changes to the Rockbox frontend: - Removes extraneous underline from Extensive Help text. - Implements a workaround for an upstream breaking change that removes the BLITTER_FROMSAVED flag. We depend on this for mouse mode. This is apparently the only place this flag was ever used. Note that I've hardcoded an arbitrary negative value for BLITTER_FROMSAVED instead of -1, for the reason Ben Harris mentioned in his commit removing it from the upstream source tree. - Adds an implicit clip() to the game region when drawing a puzzle. This fixes a bug in Untangle where dragging a point off screen leads to ugly lines outside the play area. - Implements "Quick Help" for unfinished plugins (but not "Extensive Help"). - Documents the need to disable unfinished plugins in resync.sh (weak symbols on win32). Change-Id: Ic318a5db4b15acb437a3f951fbc9b7919c6fa652
This commit is contained in:
Franklin Wei
parent
306d8d4fc9
commit
be5457b5eb
89 changed files with 9080 additions and 8527 deletions
|
|
@ -6,86 +6,85 @@
|
|||
|
||||
struct style_text help_text_style[] = {
|
||||
{ 0, TEXT_CENTER | C_RED },
|
||||
{ 133, TEXT_CENTER | C_RED },
|
||||
{ 445, TEXT_CENTER | C_RED },
|
||||
{ 132, TEXT_CENTER | C_RED },
|
||||
{ 444, TEXT_CENTER | C_RED },
|
||||
{ 461, TEXT_UNDERLINE },
|
||||
{ 462, TEXT_UNDERLINE },
|
||||
{ 463, TEXT_UNDERLINE },
|
||||
{ 473, TEXT_UNDERLINE },
|
||||
{ 472, TEXT_UNDERLINE },
|
||||
LAST_STYLE_ITEM
|
||||
};
|
||||
|
||||
/* orig 2766 comp 1876 ratio 0.678236 level 10 saved 890 */
|
||||
/* orig 2745 comp 1866 ratio 0.679781 level 10 saved 879 */
|
||||
const char help_text[] = {
|
||||
0xff, 0x08, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
|
||||
0xf0, 0x41, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
|
||||
0x32, 0x38, 0x3a, 0x20, 0x47, 0x61, 0x6c, 0x61, 0x78, 0x69,
|
||||
0x65, 0x73, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x00, 0xf0, 0x2c,
|
||||
0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
|
||||
0x65, 0x00, 0x61, 0x00, 0x72, 0x65, 0x63, 0x74, 0x61, 0x6e,
|
||||
0x67, 0x75, 0x6c, 0x61, 0x72, 0x00, 0x67, 0x72, 0x69, 0x64,
|
||||
0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e,
|
||||
0x67, 0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
|
||||
0x00, 0x6f, 0x66, 0x00, 0x64, 0x6f, 0x74, 0x73, 0x2e, 0x39,
|
||||
0x00, 0xf4, 0x0a, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69,
|
||||
0x73, 0x00, 0x74, 0x6f, 0x00, 0x70, 0x61, 0x72, 0x74, 0x69,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x00, 0x74, 0x68, 0x65, 0x4b, 0x00,
|
||||
0x70, 0x6c, 0x65, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x49, 0x00,
|
||||
0xe0, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x00, 0x72, 0x65,
|
||||
0x67, 0x69, 0x6f, 0x6e, 0x73, 0x47, 0x00, 0xf3, 0x12, 0x73,
|
||||
0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x69, 0x6e,
|
||||
0x00, 0x73, 0x75, 0x63, 0x68, 0x00, 0x61, 0x00, 0x77, 0x61,
|
||||
0x79, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x65, 0x76, 0x65,
|
||||
0x72, 0x79, 0x2d, 0x00, 0x00, 0x61, 0x00, 0xf0, 0x00, 0x31,
|
||||
0x38, 0x30, 0x2d, 0x64, 0x65, 0x67, 0x72, 0x65, 0x65, 0x00,
|
||||
0x72, 0x6f, 0x74, 0x61, 0x68, 0x00, 0xf5, 0x03, 0x61, 0x6c,
|
||||
0x6c, 0x79, 0x00, 0x73, 0x79, 0x6d, 0x6d, 0x65, 0x74, 0x72,
|
||||
0x69, 0x63, 0x2c, 0x00, 0x61, 0x6e, 0xb1, 0x00, 0xd0, 0x73,
|
||||
0x00, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, 0x79, 0x00, 0x6f,
|
||||
0x6e, 0x65, 0xaf, 0x00, 0x60, 0x00, 0x77, 0x68, 0x69, 0x63,
|
||||
0x68, 0x49, 0x00, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x88, 0x00,
|
||||
0xd1, 0x61, 0x74, 0x00, 0x69, 0x74, 0x73, 0x00, 0x63, 0x65,
|
||||
0x6e, 0x74, 0x72, 0x65, 0x8e, 0x00, 0x02, 0x4a, 0x00, 0xf0,
|
||||
0x00, 0x79, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x00, 0x65,
|
||||
0x6e, 0x74, 0x65, 0x72, 0x00, 0x79, 0xe4, 0x00, 0x40, 0x73,
|
||||
0x6f, 0x6c, 0x75, 0x71, 0x00, 0x10, 0x2c, 0x0f, 0x00, 0xf1,
|
||||
0x02, 0x00, 0x64, 0x72, 0x61, 0x77, 0x00, 0x6c, 0x69, 0x6e,
|
||||
0x65, 0x73, 0x00, 0x61, 0x6c, 0x6f, 0x6e, 0x67, 0xef, 0x00,
|
||||
0x01, 0x2e, 0x01, 0x41, 0x65, 0x64, 0x67, 0x65, 0x0b, 0x01,
|
||||
0x41, 0x6d, 0x61, 0x72, 0x6b, 0x17, 0x00, 0x91, 0x62, 0x6f,
|
||||
0x75, 0x6e, 0x64, 0x61, 0x72, 0x69, 0x65, 0xf0, 0x00, 0x02,
|
||||
0x18, 0x01, 0x01, 0xff, 0x00, 0xc0, 0x2e, 0x00, 0x54, 0x68,
|
||||
0x65, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x96, 0x00,
|
||||
0xc2, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x00,
|
||||
0x77, 0x68, 0x65, 0x41, 0x01, 0x00, 0x44, 0x00, 0x23, 0x65,
|
||||
0x64, 0x69, 0x00, 0x26, 0x6f, 0x6e, 0x66, 0x00, 0xc0, 0x61,
|
||||
0x72, 0x65, 0x00, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x65,
|
||||
0x6c, 0x2d, 0x01, 0x32, 0x6f, 0x73, 0x65, 0x33, 0x01, 0xc4,
|
||||
0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x65, 0x00, 0x74,
|
||||
0x77, 0x6f, 0x5c, 0x01, 0x30, 0x00, 0x62, 0x65, 0xa4, 0x00,
|
||||
0x10, 0x69, 0xa7, 0x00, 0xb6, 0x6f, 0x00, 0x64, 0x69, 0x66,
|
||||
0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x87, 0x00, 0x64, 0x00,
|
||||
0x00, 0x54, 0x68, 0x69, 0x73, 0x8a, 0x00, 0x90, 0x77, 0x61,
|
||||
0x73, 0x00, 0x69, 0x6e, 0x76, 0x65, 0x6e, 0x22, 0x01, 0xf1,
|
||||
0x06, 0x62, 0x79, 0x00, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69,
|
||||
0x00, 0x5b, 0x31, 0x33, 0x5d, 0x2c, 0x00, 0x75, 0x6e, 0x64,
|
||||
0x65, 0x72, 0x88, 0x00, 0x80, 0x6e, 0x61, 0x6d, 0x65, 0x00,
|
||||
0x60, 0x54, 0x65, 0x6c, 0x01, 0x71, 0x00, 0x53, 0x68, 0x6f,
|
||||
0x77, 0x27, 0x3b, 0x4d, 0x01, 0x01, 0x18, 0x00, 0x02, 0xce,
|
||||
0x00, 0x30, 0x6d, 0x6f, 0x6e, 0x9e, 0x00, 0x51, 0x72, 0x61,
|
||||
0x6e, 0x73, 0x6c, 0x70, 0x01, 0x01, 0x07, 0x02, 0xf4, 0x04,
|
||||
0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x00, 0x61, 0x73,
|
||||
0x00, 0x60, 0x53, 0x70, 0x69, 0x72, 0x61, 0x6c, 0x00, 0xa0,
|
||||
0x02, 0x10, 0x27, 0x8c, 0x00, 0x04, 0x0d, 0x00, 0x01, 0x89,
|
||||
0x00, 0x00, 0xcc, 0x01, 0x40, 0x72, 0x69, 0x62, 0x75, 0x3e,
|
||||
0x00, 0x51, 0x74, 0x6f, 0x00, 0x74, 0x68, 0x5a, 0x00, 0x41,
|
||||
0x6c, 0x6c, 0x65, 0x63, 0x66, 0x02, 0xe1, 0x62, 0x79, 0x00,
|
||||
0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61, 0x72, 0x76,
|
||||
0x65, 0xb7, 0x01, 0x00, 0xa8, 0x00, 0xe1, 0x00, 0x68, 0x74,
|
||||
0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e,
|
||||
0x6e, 0xc0, 0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70,
|
||||
0x2f, 0x65, 0x6e, 0x2f, 0xe7, 0x00, 0x31, 0x73, 0x2f, 0x74,
|
||||
0xbb, 0x00, 0xd6, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x2f, 0x00,
|
||||
0x00, 0x00, 0x32, 0x38, 0x2e, 0x31, 0x29, 0x03, 0x01, 0x78,
|
||||
0x00, 0xf0, 0x02, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00,
|
||||
0x65, 0x73, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00,
|
||||
0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x72, 0x65, 0x63,
|
||||
0x74, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x00, 0x67,
|
||||
0x72, 0x69, 0x64, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69,
|
||||
0x6e, 0x69, 0x6e, 0x67, 0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d,
|
||||
0x62, 0x65, 0x72, 0x00, 0x6f, 0x66, 0x00, 0x64, 0x6f, 0x74,
|
||||
0x73, 0x2e, 0x39, 0x00, 0xf4, 0x0a, 0x72, 0x00, 0x61, 0x69,
|
||||
0x6d, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x70, 0x61,
|
||||
0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x74, 0x68,
|
||||
0x65, 0x4b, 0x00, 0x70, 0x6c, 0x65, 0x00, 0x69, 0x6e, 0x74,
|
||||
0x6f, 0x49, 0x00, 0xe0, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64,
|
||||
0x00, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x47, 0x00,
|
||||
0xf3, 0x12, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c,
|
||||
0x00, 0x69, 0x6e, 0x00, 0x73, 0x75, 0x63, 0x68, 0x00, 0x61,
|
||||
0x00, 0x77, 0x61, 0x79, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00,
|
||||
0x65, 0x76, 0x65, 0x72, 0x79, 0x2d, 0x00, 0x00, 0x61, 0x00,
|
||||
0xf0, 0x00, 0x31, 0x38, 0x30, 0x2d, 0x64, 0x65, 0x67, 0x72,
|
||||
0x65, 0x65, 0x00, 0x72, 0x6f, 0x74, 0x61, 0x68, 0x00, 0xf5,
|
||||
0x03, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x79, 0x6d, 0x6d,
|
||||
0x65, 0x74, 0x72, 0x69, 0x63, 0x2c, 0x00, 0x61, 0x6e, 0xb1,
|
||||
0x00, 0xd0, 0x73, 0x00, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c,
|
||||
0x79, 0x00, 0x6f, 0x6e, 0x65, 0xaf, 0x00, 0x60, 0x00, 0x77,
|
||||
0x68, 0x69, 0x63, 0x68, 0x49, 0x00, 0x40, 0x6c, 0x6f, 0x63,
|
||||
0x61, 0x88, 0x00, 0xd1, 0x61, 0x74, 0x00, 0x69, 0x74, 0x73,
|
||||
0x00, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x65, 0x8e, 0x00, 0x02,
|
||||
0x4a, 0x00, 0xf0, 0x00, 0x79, 0x2e, 0x00, 0x00, 0x00, 0x54,
|
||||
0x6f, 0x00, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x00, 0x79, 0xe4,
|
||||
0x00, 0x40, 0x73, 0x6f, 0x6c, 0x75, 0x71, 0x00, 0x10, 0x2c,
|
||||
0x0f, 0x00, 0xf1, 0x02, 0x00, 0x64, 0x72, 0x61, 0x77, 0x00,
|
||||
0x6c, 0x69, 0x6e, 0x65, 0x73, 0x00, 0x61, 0x6c, 0x6f, 0x6e,
|
||||
0x67, 0xef, 0x00, 0x01, 0x2e, 0x01, 0x41, 0x65, 0x64, 0x67,
|
||||
0x65, 0x0b, 0x01, 0x41, 0x6d, 0x61, 0x72, 0x6b, 0x17, 0x00,
|
||||
0x91, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x69, 0x65,
|
||||
0xf0, 0x00, 0x02, 0x18, 0x01, 0x01, 0xff, 0x00, 0xc0, 0x2e,
|
||||
0x00, 0x54, 0x68, 0x65, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c,
|
||||
0x65, 0x96, 0x00, 0xc2, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
|
||||
0x74, 0x65, 0x00, 0x77, 0x68, 0x65, 0x41, 0x01, 0x00, 0x44,
|
||||
0x00, 0x23, 0x65, 0x64, 0x69, 0x00, 0x26, 0x6f, 0x6e, 0x66,
|
||||
0x00, 0xc0, 0x61, 0x72, 0x65, 0x00, 0x70, 0x72, 0x65, 0x63,
|
||||
0x69, 0x73, 0x65, 0x6c, 0x2d, 0x01, 0x32, 0x6f, 0x73, 0x65,
|
||||
0x33, 0x01, 0xc4, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74,
|
||||
0x65, 0x00, 0x74, 0x77, 0x6f, 0x5c, 0x01, 0x30, 0x00, 0x62,
|
||||
0x65, 0xa4, 0x00, 0x10, 0x69, 0xa7, 0x00, 0xb6, 0x6f, 0x00,
|
||||
0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x87,
|
||||
0x00, 0x64, 0x00, 0x00, 0x54, 0x68, 0x69, 0x73, 0x8a, 0x00,
|
||||
0x90, 0x77, 0x61, 0x73, 0x00, 0x69, 0x6e, 0x76, 0x65, 0x6e,
|
||||
0x22, 0x01, 0xf1, 0x06, 0x62, 0x79, 0x00, 0x4e, 0x69, 0x6b,
|
||||
0x6f, 0x6c, 0x69, 0x00, 0x5b, 0x31, 0x33, 0x5d, 0x2c, 0x00,
|
||||
0x75, 0x6e, 0x64, 0x65, 0x72, 0x88, 0x00, 0x80, 0x6e, 0x61,
|
||||
0x6d, 0x65, 0x00, 0x60, 0x54, 0x65, 0x6c, 0x01, 0x71, 0x00,
|
||||
0x53, 0x68, 0x6f, 0x77, 0x27, 0x3b, 0x4d, 0x01, 0x01, 0x18,
|
||||
0x00, 0x02, 0xce, 0x00, 0x30, 0x6d, 0x6f, 0x6e, 0x9e, 0x00,
|
||||
0x51, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x70, 0x01, 0x01, 0x07,
|
||||
0x02, 0xf4, 0x04, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68,
|
||||
0x00, 0x61, 0x73, 0x00, 0x60, 0x53, 0x70, 0x69, 0x72, 0x61,
|
||||
0x6c, 0x00, 0x8b, 0x02, 0x10, 0x27, 0x8c, 0x00, 0x04, 0x0d,
|
||||
0x00, 0x01, 0x89, 0x00, 0x00, 0xcc, 0x01, 0x40, 0x72, 0x69,
|
||||
0x62, 0x75, 0x3e, 0x00, 0x51, 0x74, 0x6f, 0x00, 0x74, 0x68,
|
||||
0x5a, 0x00, 0x41, 0x6c, 0x6c, 0x65, 0x63, 0x66, 0x02, 0xe1,
|
||||
0x62, 0x79, 0x00, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48,
|
||||
0x61, 0x72, 0x76, 0x65, 0xb7, 0x01, 0x00, 0xa8, 0x00, 0xe1,
|
||||
0x00, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x77,
|
||||
0x77, 0x77, 0x2e, 0x6e, 0xc0, 0x00, 0xa2, 0x2e, 0x63, 0x6f,
|
||||
0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f, 0xe7, 0x00, 0x31,
|
||||
0x73, 0x2f, 0x74, 0xbb, 0x00, 0xd6, 0x5f, 0x73, 0x68, 0x6f,
|
||||
0x77, 0x2f, 0x00, 0x00, 0x00, 0x32, 0x38, 0x2e, 0x31, 0x14,
|
||||
0x03, 0x01, 0x78, 0x00, 0x21, 0x6f, 0x6c, 0x1d, 0x03, 0xa0,
|
||||
0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b,
|
||||
0x84, 0x01, 0x32, 0x61, 0x6e, 0x79, 0x84, 0x01, 0x00, 0x96,
|
||||
0x01, 0x01, 0x51, 0x01, 0x00, 0x0c, 0x02, 0x21, 0x61, 0x6e,
|
||||
|
|
@ -206,7 +205,8 @@ const char help_text[] = {
|
|||
0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x00,
|
||||
};
|
||||
|
||||
const unsigned short help_text_len = 2766;
|
||||
const unsigned short help_text_words = 498;
|
||||
const bool help_valid = true;
|
||||
const unsigned short help_text_len = 2745;
|
||||
const unsigned short help_text_words = 497;
|
||||
const bool help_text_valid = true;
|
||||
const char quick_help_text[] = "Divide the grid into rotationally symmetric regions each centred on a dot.";
|
||||
const bool quick_help_valid = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue