diff options
42 files changed, 84 insertions, 89 deletions
diff --git a/apps/plugins/puzzles/compress.c b/apps/plugins/puzzles/compress.c index 0e52c4b659..78b2aa4d4a 100644 --- a/apps/plugins/puzzles/compress.c +++ b/apps/plugins/puzzles/compress.c @@ -60,7 +60,7 @@ void dump_bytes(unsigned char *buf, int len) * * const char help_text_words[]; * const unsigned short help_text_len; - * const struct style_text help_text_style[]; + * struct style_text help_text_style[]; * * help_text_words consists of help_text_len bytes containing the * words of the help text, delimited with NULs, not a standard C @@ -78,7 +78,7 @@ int main() printf("#include \"lib/display_text.h\"\n\n"); - printf("const struct style_text help_text_style[] = {\n"); + printf("struct style_text help_text_style[] = {\n"); /* break up words on spaces and newline while printing indices of * underlined words */ diff --git a/apps/plugins/puzzles/help.h b/apps/plugins/puzzles/help.h index a5d2cdaa80..a5839904f5 100644 --- a/apps/plugins/puzzles/help.h +++ b/apps/plugins/puzzles/help.h @@ -6,6 +6,6 @@ extern const char help_text[]; #ifdef ROCKBOX extern const char quick_help_text[]; -extern const struct style_text help_text_style[]; +extern struct style_text help_text_style[]; extern const unsigned short help_text_len, quick_help_text_len, help_text_words; #endif diff --git a/apps/plugins/puzzles/help/blackbox.c b/apps/plugins/puzzles/help/blackbox.c index 98a8f869d6..a211ecbe92 100644 --- a/apps/plugins/puzzles/help/blackbox.c +++ b/apps/plugins/puzzles/help/blackbox.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 450, TEXT_UNDERLINE }, { 476, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/bridges.c b/apps/plugins/puzzles/help/bridges.c index 439fdfcb66..2fc7c90a4f 100644 --- a/apps/plugins/puzzles/help/bridges.c +++ b/apps/plugins/puzzles/help/bridges.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 180, TEXT_CENTER | C_RED }, { 312, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/cube.c b/apps/plugins/puzzles/help/cube.c index e877b1987b..32fa8166c1 100644 --- a/apps/plugins/puzzles/help/cube.c +++ b/apps/plugins/puzzles/help/cube.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 207, TEXT_CENTER | C_RED }, { 319, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/dominosa.c b/apps/plugins/puzzles/help/dominosa.c index 76ec218a70..becc209a3a 100644 --- a/apps/plugins/puzzles/help/dominosa.c +++ b/apps/plugins/puzzles/help/dominosa.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 88, TEXT_CENTER | C_RED }, { 151, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/fifteen.c b/apps/plugins/puzzles/help/fifteen.c index 9b36ff1655..f1bee5be8f 100644 --- a/apps/plugins/puzzles/help/fifteen.c +++ b/apps/plugins/puzzles/help/fifteen.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 83, TEXT_UNDERLINE }, { 86, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/filling.c b/apps/plugins/puzzles/help/filling.c index d6f94944be..d876ed29e2 100644 --- a/apps/plugins/puzzles/help/filling.c +++ b/apps/plugins/puzzles/help/filling.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 141, TEXT_CENTER | C_RED }, { 306, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/flip.c b/apps/plugins/puzzles/help/flip.c index 3bb2bd2b6f..2c11fc4692 100644 --- a/apps/plugins/puzzles/help/flip.c +++ b/apps/plugins/puzzles/help/flip.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 76, TEXT_CENTER | C_RED }, { 164, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/flood.c b/apps/plugins/puzzles/help/flood.c index 290cb1339e..6841e50453 100644 --- a/apps/plugins/puzzles/help/flood.c +++ b/apps/plugins/puzzles/help/flood.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 155, TEXT_CENTER | C_RED }, { 261, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/galaxies.c b/apps/plugins/puzzles/help/galaxies.c index beb3954820..b6d836d065 100644 --- a/apps/plugins/puzzles/help/galaxies.c +++ b/apps/plugins/puzzles/help/galaxies.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 94, TEXT_CENTER | C_RED }, { 402, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/guess.c b/apps/plugins/puzzles/help/guess.c index 4bfe7f77c8..dbeb34c2a6 100644 --- a/apps/plugins/puzzles/help/guess.c +++ b/apps/plugins/puzzles/help/guess.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 123, TEXT_CENTER | C_RED }, { 404, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/inertia.c b/apps/plugins/puzzles/help/inertia.c index ededa0d92f..486a5ac546 100644 --- a/apps/plugins/puzzles/help/inertia.c +++ b/apps/plugins/puzzles/help/inertia.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 39, TEXT_UNDERLINE }, { 110, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/keen.c b/apps/plugins/puzzles/help/keen.c index 22383e153b..5ed75b3d62 100644 --- a/apps/plugins/puzzles/help/keen.c +++ b/apps/plugins/puzzles/help/keen.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 324, TEXT_CENTER | C_RED }, { 391, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/lightup.c b/apps/plugins/puzzles/help/lightup.c index e520a7465e..c588a6b5d0 100644 --- a/apps/plugins/puzzles/help/lightup.c +++ b/apps/plugins/puzzles/help/lightup.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 169, TEXT_CENTER | C_RED }, { 304, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/loopy.c b/apps/plugins/puzzles/help/loopy.c index 8845bfccf6..a9d20ed008 100644 --- a/apps/plugins/puzzles/help/loopy.c +++ b/apps/plugins/puzzles/help/loopy.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 169, TEXT_CENTER | C_RED }, { 220, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/magnets.c b/apps/plugins/puzzles/help/magnets.c index 923b21127b..7e679f3e5d 100644 --- a/apps/plugins/puzzles/help/magnets.c +++ b/apps/plugins/puzzles/help/magnets.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 143, TEXT_CENTER | C_RED }, { 323, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/map.c b/apps/plugins/puzzles/help/map.c index d046f992f5..676272ea2e 100644 --- a/apps/plugins/puzzles/help/map.c +++ b/apps/plugins/puzzles/help/map.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 81, TEXT_UNDERLINE }, { 157, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/mines.c b/apps/plugins/puzzles/help/mines.c index 66a81b049d..689c483111 100644 --- a/apps/plugins/puzzles/help/mines.c +++ b/apps/plugins/puzzles/help/mines.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 29, TEXT_UNDERLINE }, { 119, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/net.c b/apps/plugins/puzzles/help/net.c index 3328c42975..a27fd65c17 100644 --- a/apps/plugins/puzzles/help/net.c +++ b/apps/plugins/puzzles/help/net.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 3, TEXT_UNDERLINE }, { 120, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/netslide.c b/apps/plugins/puzzles/help/netslide.c index ab187f4049..259e434d5f 100644 --- a/apps/plugins/puzzles/help/netslide.c +++ b/apps/plugins/puzzles/help/netslide.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, LAST_STYLE_ITEM }; diff --git a/apps/plugins/puzzles/help/palisade.c b/apps/plugins/puzzles/help/palisade.c index dfa5c5be4f..2034c7ce79 100644 --- a/apps/plugins/puzzles/help/palisade.c +++ b/apps/plugins/puzzles/help/palisade.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 87, TEXT_CENTER | C_RED }, { 149, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/pattern.c b/apps/plugins/puzzles/help/pattern.c index b9dd0ea1ec..c0e5fc306a 100644 --- a/apps/plugins/puzzles/help/pattern.c +++ b/apps/plugins/puzzles/help/pattern.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 137, TEXT_UNDERLINE }, { 173, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/pearl.c b/apps/plugins/puzzles/help/pearl.c index ac2988a645..84dec04e71 100644 --- a/apps/plugins/puzzles/help/pearl.c +++ b/apps/plugins/puzzles/help/pearl.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 138, TEXT_UNDERLINE }, { 164, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/pegs.c b/apps/plugins/puzzles/help/pegs.c index 17151ebb0a..b07fb0ac47 100644 --- a/apps/plugins/puzzles/help/pegs.c +++ b/apps/plugins/puzzles/help/pegs.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 72, TEXT_CENTER | C_RED }, { 228, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/range.c b/apps/plugins/puzzles/help/range.c index ddf6705f3d..d8b6bf4d3b 100644 --- a/apps/plugins/puzzles/help/range.c +++ b/apps/plugins/puzzles/help/range.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 212, TEXT_CENTER | C_RED }, { 245, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/rect.c b/apps/plugins/puzzles/help/rect.c index c971942a03..579ff29626 100644 --- a/apps/plugins/puzzles/help/rect.c +++ b/apps/plugins/puzzles/help/rect.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 144, TEXT_CENTER | C_RED }, { 311, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/samegame.c b/apps/plugins/puzzles/help/samegame.c index 0eefab2241..be7c0ae2fe 100644 --- a/apps/plugins/puzzles/help/samegame.c +++ b/apps/plugins/puzzles/help/samegame.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 116, TEXT_CENTER | C_RED }, { 229, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/signpost.c b/apps/plugins/puzzles/help/signpost.c index 06201f77c1..f12c526346 100644 --- a/apps/plugins/puzzles/help/signpost.c +++ b/apps/plugins/puzzles/help/signpost.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 158, TEXT_CENTER | C_RED }, { 495, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/singles.c b/apps/plugins/puzzles/help/singles.c index ced0c3b5ae..d6d88e9864 100644 --- a/apps/plugins/puzzles/help/singles.c +++ b/apps/plugins/puzzles/help/singles.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 122, TEXT_CENTER | C_RED }, { 212, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/sixteen.c b/apps/plugins/puzzles/help/sixteen.c index bbd601cec2..c1cbee5807 100644 --- a/apps/plugins/puzzles/help/sixteen.c +++ b/apps/plugins/puzzles/help/sixteen.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 113, TEXT_UNDERLINE }, { 187, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/slant.c b/apps/plugins/puzzles/help/slant.c index 57a939efa1..3c46d46f51 100644 --- a/apps/plugins/puzzles/help/slant.c +++ b/apps/plugins/puzzles/help/slant.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 125, TEXT_CENTER | C_RED }, { 328, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/solo.c b/apps/plugins/puzzles/help/solo.c index aa49d5698c..94f4c260bf 100644 --- a/apps/plugins/puzzles/help/solo.c +++ b/apps/plugins/puzzles/help/solo.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 360, TEXT_UNDERLINE }, { 390, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/tents.c b/apps/plugins/puzzles/help/tents.c index b120ba30cc..6ab7968db2 100644 --- a/apps/plugins/puzzles/help/tents.c +++ b/apps/plugins/puzzles/help/tents.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 102, TEXT_UNDERLINE }, { 160, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/towers.c b/apps/plugins/puzzles/help/towers.c index 80067eeb95..534ec8a15b 100644 --- a/apps/plugins/puzzles/help/towers.c +++ b/apps/plugins/puzzles/help/towers.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 216, TEXT_CENTER | C_RED }, { 291, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/tracks.c b/apps/plugins/puzzles/help/tracks.c index 8800cbf3f4..eafeeea6f5 100644 --- a/apps/plugins/puzzles/help/tracks.c +++ b/apps/plugins/puzzles/help/tracks.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 86, TEXT_CENTER | C_RED }, { 207, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/twiddle.c b/apps/plugins/puzzles/help/twiddle.c index 2ae720e3e7..300a69dc54 100644 --- a/apps/plugins/puzzles/help/twiddle.c +++ b/apps/plugins/puzzles/help/twiddle.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 137, TEXT_CENTER | C_RED }, { 297, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/undead.c b/apps/plugins/puzzles/help/undead.c index 90e7940498..91a347dcbe 100644 --- a/apps/plugins/puzzles/help/undead.c +++ b/apps/plugins/puzzles/help/undead.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 202, TEXT_CENTER | C_RED }, { 282, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/unequal.c b/apps/plugins/puzzles/help/unequal.c index 1e91635cc9..52b2a1c8e1 100644 --- a/apps/plugins/puzzles/help/unequal.c +++ b/apps/plugins/puzzles/help/unequal.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 239, TEXT_CENTER | C_RED }, { 306, TEXT_UNDERLINE }, diff --git a/apps/plugins/puzzles/help/unruly.c b/apps/plugins/puzzles/help/unruly.c index 0cb36f9523..31e88165ae 100644 --- a/apps/plugins/puzzles/help/unruly.c +++ b/apps/plugins/puzzles/help/unruly.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 99, TEXT_CENTER | C_RED }, { 221, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/help/untangle.c b/apps/plugins/puzzles/help/untangle.c index 9d72b8b0b0..4a90fa863e 100644 --- a/apps/plugins/puzzles/help/untangle.c +++ b/apps/plugins/puzzles/help/untangle.c @@ -1,10 +1,10 @@ -/* auto-generated on Mar 17 2018 by genhelp.sh */ +/* auto-generated on Apr 19 2018 by genhelp.sh */ /* help text is compressed using LZ4; see compress.c for details */ /* DO NOT EDIT! */ #include "lib/display_text.h" -const struct style_text help_text_style[] = { +struct style_text help_text_style[] = { { 0, TEXT_CENTER | C_RED }, { 64, TEXT_CENTER | C_RED }, { 100, TEXT_CENTER | C_RED }, diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c index b3a225ae89..1982da8e3e 100644 --- a/apps/plugins/puzzles/rockbox.c +++ b/apps/plugins/puzzles/rockbox.c @@ -1310,11 +1310,6 @@ static void rb_status_bar(void *handle, const char *text) LOGF("game title is %s\n", text); } -static int get_titleheight(void) -{ - return rb->font_get(FONT_UI)->height; -} - static void draw_title(bool clear_first) { const char *base; @@ -1327,7 +1322,7 @@ static void draw_title(bool clear_first) rb->snprintf(str, sizeof(str), "%s%s", base, zoom_enabled ? (view_mode ? " (viewing)" : " (interaction)") : ""); /* quick hack */ - bool orig_clipped; + bool orig_clipped = false; if(!zoom_enabled) { orig_clipped = clipped; @@ -3421,10 +3416,10 @@ enum plugin_status plugin_start(const void *param) { /* Solo needs a big stack */ int stack_sz = 16 * DEFAULT_STACK_SIZE; - uintptr_t old = smalloc(stack_sz); + uintptr_t old = (uintptr_t)smalloc(stack_sz); /* word alignment */ - long *stack = ((uintptr_t)old & (uintptr_t)(~0x3)) + 4; + long *stack = (long*)((char*)(((uintptr_t)old & (uintptr_t)(~0x3)) + 4)); stack_sz -= ((char*)stack - (char*)old); thread = rb->create_thread(puzzles_main, stack, stack_sz, 0, "puzzles" |