mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-11 14:12:26 -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,96 +6,96 @@
|
|||
|
||||
struct style_text help_text_style[] = {
|
||||
{ 0, TEXT_CENTER | C_RED },
|
||||
{ 65, TEXT_CENTER | C_RED },
|
||||
{ 136, TEXT_CENTER | C_RED },
|
||||
{ 155, TEXT_UNDERLINE },
|
||||
{ 64, TEXT_CENTER | C_RED },
|
||||
{ 135, TEXT_CENTER | C_RED },
|
||||
{ 154, TEXT_UNDERLINE },
|
||||
LAST_STYLE_ITEM
|
||||
};
|
||||
|
||||
/* orig 974 comp 787 ratio 0.808008 level 4 saved 187 */
|
||||
/* orig 953 comp 779 ratio 0.817419 level 4 saved 174 */
|
||||
const char help_text[] = {
|
||||
0xff, 0x08, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
|
||||
0xf0, 0x2f, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
|
||||
0x31, 0x38, 0x3a, 0x20, 0x55, 0x6e, 0x74, 0x61, 0x6e, 0x67,
|
||||
0x6c, 0x65, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x00, 0xf0, 0x1a,
|
||||
0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65,
|
||||
0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x6e,
|
||||
0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x6f, 0x66, 0x00, 0x70,
|
||||
0x6f, 0x69, 0x6e, 0x74, 0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d,
|
||||
0x65, 0x10, 0x00, 0xf1, 0x15, 0x77, 0x68, 0x69, 0x63, 0x68,
|
||||
0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x6c, 0x69, 0x6e, 0x65,
|
||||
0x73, 0x00, 0x64, 0x72, 0x61, 0x77, 0x6e, 0x00, 0x62, 0x65,
|
||||
0x74, 0x77, 0x65, 0x65, 0x6e, 0x00, 0x74, 0x68, 0x65, 0x6d,
|
||||
0x2e, 0x4f, 0x00, 0x80, 0x63, 0x61, 0x6e, 0x00, 0x6d, 0x6f,
|
||||
0x76, 0x65, 0x13, 0x00, 0x03, 0x46, 0x00, 0xf8, 0x1c, 0x00,
|
||||
0x61, 0x62, 0x6f, 0x75, 0x74, 0x00, 0x61, 0x72, 0x62, 0x69,
|
||||
0x74, 0x72, 0x61, 0x72, 0x69, 0x6c, 0x79, 0x3b, 0x00, 0x79,
|
||||
0x6f, 0x75, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73,
|
||||
0x00, 0x74, 0x6f, 0x00, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x36, 0x00, 0xa1, 0x73, 0x6f, 0x00, 0x74, 0x68,
|
||||
0x61, 0x74, 0x00, 0x6e, 0x6f, 0x73, 0x00, 0xf2, 0x1c, 0x00,
|
||||
0x63, 0x72, 0x6f, 0x73, 0x73, 0x65, 0x73, 0x00, 0x61, 0x6e,
|
||||
0x6f, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x00, 0x00, 0x00, 0x49,
|
||||
0x00, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x6c,
|
||||
0x79, 0x00, 0x73, 0x61, 0x77, 0x00, 0x74, 0x68, 0x69, 0x73,
|
||||
0x00, 0x69, 0x47, 0x00, 0x40, 0x66, 0x6f, 0x72, 0x6d, 0xbb,
|
||||
0x00, 0xf0, 0x2b, 0x61, 0x00, 0x46, 0x6c, 0x61, 0x73, 0x68,
|
||||
0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x63, 0x61, 0x6c, 0x6c,
|
||||
0x65, 0x64, 0x00, 0x50, 0x6c, 0x61, 0x6e, 0x61, 0x72, 0x69,
|
||||
0x74, 0x79, 0x00, 0x5b, 0x37, 0x5d, 0x2c, 0x00, 0x77, 0x72,
|
||||
0x69, 0x74, 0x74, 0x65, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x4a,
|
||||
0x6f, 0x68, 0x6e, 0x00, 0x54, 0x61, 0x6e, 0x74, 0x61, 0x6c,
|
||||
0x6f, 0x63, 0x00, 0xc4, 0x5b, 0x37, 0x5d, 0x00, 0x68, 0x74,
|
||||
0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x70, 0x35, 0x00, 0xb6, 0x2e,
|
||||
0x6e, 0x65, 0x74, 0x00, 0x00, 0x00, 0x31, 0x38, 0x2e, 0x31,
|
||||
0x64, 0x01, 0xe2, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
|
||||
0x73, 0x20, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x04, 0x01, 0x12,
|
||||
0x61, 0xcc, 0x00, 0xf1, 0x03, 0x2c, 0x00, 0x63, 0x6c, 0x69,
|
||||
0x63, 0x6b, 0x00, 0x6f, 0x6e, 0x00, 0x69, 0x74, 0x00, 0x77,
|
||||
0x69, 0x74, 0x68, 0xa1, 0x00, 0xf0, 0x06, 0x6c, 0x65, 0x66,
|
||||
0x74, 0x00, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00, 0x62, 0x75,
|
||||
0x74, 0x74, 0x6f, 0x6e, 0x00, 0x61, 0x6e, 0x64, 0x59, 0x01,
|
||||
0x10, 0x67, 0x27, 0x00, 0x40, 0x69, 0x6e, 0x74, 0x6f, 0x93,
|
||||
0x01, 0x25, 0x65, 0x77, 0x1e, 0x01, 0x00, 0x90, 0x00, 0xf0,
|
||||
0x11, 0x54, 0x68, 0x65, 0x00, 0x63, 0x75, 0x72, 0x73, 0x6f,
|
||||
0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x00, 0x6d, 0x61, 0x79,
|
||||
0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x62, 0x65, 0x00, 0x75,
|
||||
0x73, 0x65, 0x64, 0x4e, 0x01, 0xf7, 0x01, 0x6e, 0x61, 0x76,
|
||||
0x69, 0x67, 0x61, 0x74, 0x65, 0x00, 0x61, 0x6d, 0x6f, 0x6e,
|
||||
0x67, 0x73, 0x74, 0x56, 0x01, 0xa1, 0x2e, 0x00, 0x50, 0x72,
|
||||
0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x15, 0x00, 0x41, 0x45,
|
||||
0x6e, 0x74, 0x65, 0x49, 0x00, 0xc1, 0x00, 0x77, 0x69, 0x6c,
|
||||
0x6c, 0x00, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x83, 0x00,
|
||||
0x14, 0x67, 0x23, 0x00, 0xf2, 0x07, 0x63, 0x75, 0x72, 0x72,
|
||||
0x65, 0x6e, 0x74, 0x6c, 0x79, 0x2d, 0x00, 0x68, 0x69, 0x67,
|
||||
0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4f, 0x00,
|
||||
0x07, 0x4e, 0x00, 0xc2, 0x54, 0x61, 0x62, 0x00, 0x6f, 0x72,
|
||||
0x00, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4d, 0x00, 0x40, 0x63,
|
||||
0x79, 0x63, 0x6c, 0x07, 0x02, 0x99, 0x72, 0x6f, 0x75, 0x67,
|
||||
0x68, 0x00, 0x61, 0x6c, 0x6c, 0x87, 0x00, 0x43, 0x00, 0x00,
|
||||
0x28, 0x41, 0x13, 0x00, 0x20, 0x61, 0x63, 0xdd, 0x00, 0xb0,
|
||||
0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
|
||||
0x64, 0xc2, 0x01, 0x21, 0x73, 0x65, 0x16, 0x00, 0x41, 0x00,
|
||||
0x32, 0x2e, 0x31, 0xa3, 0x02, 0x01, 0xe4, 0x00, 0xb2, 0x61,
|
||||
0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29,
|
||||
0x80, 0x01, 0x16, 0x32, 0x80, 0x01, 0x92, 0x70, 0x61, 0x72,
|
||||
0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x82, 0x01, 0x40, 0x68,
|
||||
0x65, 0x72, 0x65, 0x5d, 0x02, 0x95, 0x6f, 0x6e, 0x6c, 0x79,
|
||||
0x00, 0x6f, 0x6e, 0x65, 0x00, 0x20, 0x00, 0x06, 0x46, 0x00,
|
||||
0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x83, 0x00, 0xe1, 0x60,
|
||||
0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27,
|
||||
0x00, 0x6f, 0x70, 0x79, 0x00, 0x03, 0x8d, 0x02, 0xf1, 0x01,
|
||||
0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e,
|
||||
0x75, 0x3a, 0x00, 0x00, 0x00, 0x4e, 0x22, 0x03, 0x43, 0x20,
|
||||
0x6f, 0x66, 0x20, 0xa6, 0x02, 0x33, 0x00, 0x00, 0x43, 0xf9,
|
||||
0x01, 0x01, 0x2f, 0x00, 0x31, 0x73, 0x69, 0x7a, 0x30, 0x03,
|
||||
0x01, 0xeb, 0x00, 0x60, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2c,
|
||||
0x56, 0x02, 0x74, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79,
|
||||
0x54, 0x01, 0x0c, 0x68, 0x03, 0x04, 0xb3, 0x02, 0xf0, 0x02,
|
||||
0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x00,
|
||||
0x67, 0x72, 0x61, 0x70, 0x68, 0x2e, 0x00,
|
||||
0x6c, 0x65, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00,
|
||||
0x61, 0x72, 0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00,
|
||||
0x61, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x6f,
|
||||
0x66, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x2c, 0x00,
|
||||
0x73, 0x6f, 0x6d, 0x65, 0x10, 0x00, 0xf1, 0x15, 0x77, 0x68,
|
||||
0x69, 0x63, 0x68, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x6c,
|
||||
0x69, 0x6e, 0x65, 0x73, 0x00, 0x64, 0x72, 0x61, 0x77, 0x6e,
|
||||
0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x00, 0x74,
|
||||
0x68, 0x65, 0x6d, 0x2e, 0x4f, 0x00, 0x80, 0x63, 0x61, 0x6e,
|
||||
0x00, 0x6d, 0x6f, 0x76, 0x65, 0x13, 0x00, 0x03, 0x46, 0x00,
|
||||
0xf8, 0x1c, 0x00, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x00, 0x61,
|
||||
0x72, 0x62, 0x69, 0x74, 0x72, 0x61, 0x72, 0x69, 0x6c, 0x79,
|
||||
0x3b, 0x00, 0x79, 0x6f, 0x75, 0x72, 0x00, 0x61, 0x69, 0x6d,
|
||||
0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x70, 0x6f, 0x73,
|
||||
0x69, 0x74, 0x69, 0x6f, 0x6e, 0x36, 0x00, 0xa1, 0x73, 0x6f,
|
||||
0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x6e, 0x6f, 0x73, 0x00,
|
||||
0xf2, 0x1c, 0x00, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x65, 0x73,
|
||||
0x00, 0x61, 0x6e, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x00,
|
||||
0x00, 0x00, 0x49, 0x00, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e,
|
||||
0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x61, 0x77, 0x00, 0x74,
|
||||
0x68, 0x69, 0x73, 0x00, 0x69, 0x47, 0x00, 0x40, 0x66, 0x6f,
|
||||
0x72, 0x6d, 0xbb, 0x00, 0xf0, 0x2b, 0x61, 0x00, 0x46, 0x6c,
|
||||
0x61, 0x73, 0x68, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x63,
|
||||
0x61, 0x6c, 0x6c, 0x65, 0x64, 0x00, 0x50, 0x6c, 0x61, 0x6e,
|
||||
0x61, 0x72, 0x69, 0x74, 0x79, 0x00, 0x5b, 0x37, 0x5d, 0x2c,
|
||||
0x00, 0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x00, 0x62,
|
||||
0x79, 0x00, 0x4a, 0x6f, 0x68, 0x6e, 0x00, 0x54, 0x61, 0x6e,
|
||||
0x74, 0x61, 0x6c, 0x6f, 0x63, 0x00, 0xc4, 0x5b, 0x37, 0x5d,
|
||||
0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x70, 0x35,
|
||||
0x00, 0xb6, 0x2e, 0x6e, 0x65, 0x74, 0x00, 0x00, 0x00, 0x31,
|
||||
0x38, 0x2e, 0x31, 0x4f, 0x01, 0x80, 0x63, 0x6f, 0x6e, 0x74,
|
||||
0x72, 0x6f, 0x6c, 0x73, 0x58, 0x01, 0x22, 0x54, 0x6f, 0x04,
|
||||
0x01, 0x12, 0x61, 0xcc, 0x00, 0xf1, 0x03, 0x2c, 0x00, 0x63,
|
||||
0x6c, 0x69, 0x63, 0x6b, 0x00, 0x6f, 0x6e, 0x00, 0x69, 0x74,
|
||||
0x00, 0x77, 0x69, 0x74, 0x68, 0xa1, 0x00, 0xf0, 0x06, 0x6c,
|
||||
0x65, 0x66, 0x74, 0x00, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00,
|
||||
0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x00, 0x61, 0x6e, 0x64,
|
||||
0x59, 0x01, 0x10, 0x67, 0x27, 0x00, 0x40, 0x69, 0x6e, 0x74,
|
||||
0x6f, 0x93, 0x01, 0x25, 0x65, 0x77, 0x1e, 0x01, 0x00, 0x90,
|
||||
0x00, 0xf0, 0x11, 0x54, 0x68, 0x65, 0x00, 0x63, 0x75, 0x72,
|
||||
0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x00, 0x6d,
|
||||
0x61, 0x79, 0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x62, 0x65,
|
||||
0x00, 0x75, 0x73, 0x65, 0x64, 0x4e, 0x01, 0xf7, 0x01, 0x6e,
|
||||
0x61, 0x76, 0x69, 0x67, 0x61, 0x74, 0x65, 0x00, 0x61, 0x6d,
|
||||
0x6f, 0x6e, 0x67, 0x73, 0x74, 0x56, 0x01, 0xa1, 0x2e, 0x00,
|
||||
0x50, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x15, 0x00,
|
||||
0x41, 0x45, 0x6e, 0x74, 0x65, 0x49, 0x00, 0xc1, 0x00, 0x77,
|
||||
0x69, 0x6c, 0x6c, 0x00, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65,
|
||||
0x83, 0x00, 0x14, 0x67, 0x23, 0x00, 0xf2, 0x07, 0x63, 0x75,
|
||||
0x72, 0x72, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x2d, 0x00, 0x68,
|
||||
0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64,
|
||||
0x4f, 0x00, 0x07, 0x4e, 0x00, 0xc2, 0x54, 0x61, 0x62, 0x00,
|
||||
0x6f, 0x72, 0x00, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4d, 0x00,
|
||||
0x40, 0x63, 0x79, 0x63, 0x6c, 0x07, 0x02, 0x99, 0x72, 0x6f,
|
||||
0x75, 0x67, 0x68, 0x00, 0x61, 0x6c, 0x6c, 0x87, 0x00, 0x43,
|
||||
0x00, 0x00, 0x28, 0x41, 0x13, 0x00, 0x20, 0x61, 0x63, 0xdd,
|
||||
0x00, 0xb0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
|
||||
0x62, 0x65, 0x64, 0xc2, 0x01, 0x21, 0x73, 0x65, 0x16, 0x00,
|
||||
0x41, 0x00, 0x32, 0x2e, 0x31, 0xa3, 0x02, 0x01, 0xe4, 0x00,
|
||||
0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65,
|
||||
0x2e, 0x29, 0x80, 0x01, 0x16, 0x32, 0x80, 0x01, 0x92, 0x70,
|
||||
0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x82, 0x01,
|
||||
0x40, 0x68, 0x65, 0x72, 0x65, 0x5d, 0x02, 0x95, 0x6f, 0x6e,
|
||||
0x6c, 0x79, 0x00, 0x6f, 0x6e, 0x65, 0x00, 0x20, 0x00, 0x06,
|
||||
0x46, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x83, 0x00,
|
||||
0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e,
|
||||
0x2e, 0x27, 0x00, 0x6f, 0x70, 0x79, 0x00, 0x03, 0x8d, 0x02,
|
||||
0xf1, 0x01, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d,
|
||||
0x65, 0x6e, 0x75, 0x3a, 0x00, 0x00, 0x00, 0x4e, 0x22, 0x03,
|
||||
0x43, 0x20, 0x6f, 0x66, 0x20, 0xa6, 0x02, 0x33, 0x00, 0x00,
|
||||
0x43, 0xf9, 0x01, 0x01, 0x2f, 0x00, 0x31, 0x73, 0x69, 0x7a,
|
||||
0x30, 0x03, 0x01, 0xeb, 0x00, 0x60, 0x75, 0x7a, 0x7a, 0x6c,
|
||||
0x65, 0x2c, 0x56, 0x02, 0x74, 0x73, 0x70, 0x65, 0x63, 0x69,
|
||||
0x66, 0x79, 0x54, 0x01, 0x0c, 0x68, 0x03, 0x04, 0xb3, 0x02,
|
||||
0xf0, 0x02, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
|
||||
0x64, 0x00, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2e, 0x00,
|
||||
};
|
||||
|
||||
const unsigned short help_text_len = 974;
|
||||
const unsigned short help_text_words = 174;
|
||||
const bool help_valid = true;
|
||||
const unsigned short help_text_len = 953;
|
||||
const unsigned short help_text_words = 173;
|
||||
const bool help_text_valid = true;
|
||||
const char quick_help_text[] = "Reposition the points so that the lines do not cross.";
|
||||
const bool quick_help_valid = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue