diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-09-04 00:46:24 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-09-04 00:46:24 +0000 |
commit | 25123570c76f2055d3ae05d79741038c0e23c536 (patch) | |
tree | a2edd8351a611b9cef0aef08c880a994d9e1d75e /apps/plugins/jackpot.c | |
parent | f6025186fd1f6d9083c07568bc3d160f3e8774f8 (diff) | |
download | rockbox-25123570c76f2055d3ae05d79741038c0e23c536.tar.gz rockbox-25123570c76f2055d3ae05d79741038c0e23c536.zip |
Fix STRIDE macro for multiscreen and add stride support for picture lib.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22615 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/jackpot.c')
-rw-r--r-- | apps/plugins/jackpot.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/plugins/jackpot.c b/apps/plugins/jackpot.c index e13dcf8994..4ab1d3a837 100644 --- a/apps/plugins/jackpot.c +++ b/apps/plugins/jackpot.c | |||
@@ -62,9 +62,11 @@ static unsigned long char_patterns[NB_SLOTS]; | |||
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | const struct picture jackpot_pictures[]={ | 64 | const struct picture jackpot_pictures[]={ |
65 | {jackpot_slots, BMPWIDTH_jackpot_slots,PICTURE_HEIGHT}, | 65 | {jackpot_slots, BMPWIDTH_jackpot_slots, BMPHEIGHT_jackpot_slots, |
66 | PICTURE_HEIGHT}, | ||
66 | #if NB_SCREENS==2 | 67 | #if NB_SCREENS==2 |
67 | {jackpot_slots_remote,BMPWIDTH_jackpot_slots_remote,REMOTE_PICTURE_HEIGHT} | 68 | {jackpot_slots_remote,BMPWIDTH_jackpot_slots_remote, |
69 | BMPHEIGHT_jackpot_slots_remote, REMOTE_PICTURE_HEIGHT} | ||
68 | #endif | 70 | #endif |
69 | }; | 71 | }; |
70 | 72 | ||
@@ -172,7 +174,7 @@ void jackpot_display_slot_machine(struct jackpot* game, struct screen* display) | |||
172 | #else | 174 | #else |
173 | const struct picture* picture= &(jackpot_pictures[display->screen_type]); | 175 | const struct picture* picture= &(jackpot_pictures[display->screen_type]); |
174 | int pos_x=(display->getwidth()-NB_SLOTS*(picture->width+1))/2; | 176 | int pos_x=(display->getwidth()-NB_SLOTS*(picture->width+1))/2; |
175 | int pos_y=(display->getheight()-(picture->height))/2; | 177 | int pos_y=(display->getheight()-(picture->slide_height))/2; |
176 | #endif /* HAVE_LCD_CHARCELLS */ | 178 | #endif /* HAVE_LCD_CHARCELLS */ |
177 | for(i=0;i<NB_SLOTS;i++) | 179 | for(i=0;i<NB_SLOTS;i++) |
178 | { | 180 | { |
@@ -181,7 +183,7 @@ void jackpot_display_slot_machine(struct jackpot* game, struct screen* display) | |||
181 | int state_y=(game->slot_state[i]*7)/PICTURE_ROTATION_STEPS; | 183 | int state_y=(game->slot_state[i]*7)/PICTURE_ROTATION_STEPS; |
182 | #else | 184 | #else |
183 | int state_y= | 185 | int state_y= |
184 | (picture->height*game->slot_state[i])/PICTURE_ROTATION_STEPS; | 186 | (picture->slide_height*game->slot_state[i])/PICTURE_ROTATION_STEPS; |
185 | #endif /* HAVE_LCD_CHARCELLS */ | 187 | #endif /* HAVE_LCD_CHARCELLS */ |
186 | int previous_state_y=game->state_y[display->screen_type][i]; | 188 | int previous_state_y=game->state_y[display->screen_type][i]; |
187 | if(state_y==previous_state_y) | 189 | if(state_y==previous_state_y) |