diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-08-18 07:17:51 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-08-18 07:17:51 +0000 |
commit | dab7e161767f951a55d6fbc0988fae5f3d9df474 (patch) | |
tree | 7fe7a5dcbc9fa3bd2ff270fee738f36e05c9dd90 /apps/gui/skin_engine/skin_display.c | |
parent | 36ca4967e0ced08ab8d262ba046189e6dfbe71da (diff) | |
download | rockbox-dab7e161767f951a55d6fbc0988fae5f3d9df474.tar.gz rockbox-dab7e161767f951a55d6fbc0988fae5f3d9df474.zip |
store the image label instead of a number so debug output is actually useful when %xd is used witout a coresponding %xl
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22404 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/skin_engine/skin_display.c')
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 1e88863307..6b86a8bc0e 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -478,13 +478,13 @@ static bool evaluate_conditional(struct gui_wps *gwps, int *token_index) | |||
478 | return true; | 478 | return true; |
479 | } | 479 | } |
480 | #ifdef HAVE_LCD_BITMAP | 480 | #ifdef HAVE_LCD_BITMAP |
481 | struct gui_img* find_image(int n, struct wps_data *data) | 481 | struct gui_img* find_image(char label, struct wps_data *data) |
482 | { | 482 | { |
483 | struct skin_token_list *list = data->images; | 483 | struct skin_token_list *list = data->images; |
484 | while (list) | 484 | while (list) |
485 | { | 485 | { |
486 | struct gui_img *img = (struct gui_img *)list->token->value.data; | 486 | struct gui_img *img = (struct gui_img *)list->token->value.data; |
487 | if (img->id == n) | 487 | if (img->label == label) |
488 | return img; | 488 | return img; |
489 | list = list->next; | 489 | list = list->next; |
490 | } | 490 | } |
@@ -555,7 +555,7 @@ static bool get_line(struct gui_wps *gwps, | |||
555 | #ifdef HAVE_LCD_BITMAP | 555 | #ifdef HAVE_LCD_BITMAP |
556 | case WPS_TOKEN_IMAGE_PRELOAD_DISPLAY: | 556 | case WPS_TOKEN_IMAGE_PRELOAD_DISPLAY: |
557 | { | 557 | { |
558 | int n = data->tokens[i].value.i & 0xFF; | 558 | char n = data->tokens[i].value.i & 0xFF; |
559 | int subimage = data->tokens[i].value.i >> 8; | 559 | int subimage = data->tokens[i].value.i >> 8; |
560 | struct gui_img *img = find_image(n, data); | 560 | struct gui_img *img = find_image(n, data); |
561 | 561 | ||