diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-05-14 13:21:40 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-05-14 13:21:40 +0000 |
| commit | 0246f0ceb4aeeb29ac7a77fc47f49c67cd7884f2 (patch) | |
| tree | 907131a6c240076fe3779c26ee77a206178afa18 /apps/plugins | |
| parent | ac43fd367ab4e2b41f2671a047c86e5ace81a33d (diff) | |
| download | rockbox-0246f0ceb4aeeb29ac7a77fc47f49c67cd7884f2.zip rockbox-0246f0ceb4aeeb29ac7a77fc47f49c67cd7884f2.tar.gz rockbox-0246f0ceb4aeeb29ac7a77fc47f49c67cd7884f2.tar.bz2 rockbox-0246f0ceb4aeeb29ac7a77fc47f49c67cd7884f2.tar.xz | |
Fix remaining reds/yellows.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26024 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/jackpot.c | 6 | ||||
| -rw-r--r-- | apps/plugins/pdbox/pdbox.h | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/apps/plugins/jackpot.c b/apps/plugins/jackpot.c index 4ab1d3a..302c5c6 100644 --- a/apps/plugins/jackpot.c +++ b/apps/plugins/jackpot.c @@ -170,7 +170,7 @@ void jackpot_display_slot_machine(struct jackpot* game, struct screen* display) int i; bool changes=false; #ifdef HAVE_LCD_CHARCELLS - display->putc(0, 0, '['); + display->putchar(0, 0, '['); #else const struct picture* picture= &(jackpot_pictures[display->screen_type]); int pos_x=(display->getwidth()-NB_SLOTS*(picture->width+1))/2; @@ -195,7 +195,7 @@ void jackpot_display_slot_machine(struct jackpot* game, struct screen* display) char* current_pattern=&(jackpot_slots_patterns[state_y]); display->define_pattern(char_patterns[i], current_pattern); - display->putc(i+1, 0, char_patterns[i]); + display->putchar(i+1, 0, char_patterns[i]); #else vertical_picture_draw_part(display, picture, state_y, pos_x, pos_y); pos_x+=(picture->width+1); @@ -204,7 +204,7 @@ void jackpot_display_slot_machine(struct jackpot* game, struct screen* display) if(changes){ #ifdef HAVE_LCD_CHARCELLS rb->snprintf(str,sizeof(str),"$%d", game->money); - display->putc(++i, 0, ']'); + display->putchar(++i, 0, ']'); display->puts(++i, 0, str); #else rb->snprintf(str,sizeof(str),"money : $%d", game->money); diff --git a/apps/plugins/pdbox/pdbox.h b/apps/plugins/pdbox/pdbox.h index 815248c..ce29c1e 100644 --- a/apps/plugins/pdbox/pdbox.h +++ b/apps/plugins/pdbox/pdbox.h @@ -107,6 +107,7 @@ float rb_atan(float); float rb_atan2(float, float); float rb_sinh(float); float rb_tan(float); +#ifndef SIMULATOR typedef struct { int quot; @@ -114,6 +115,7 @@ typedef struct } div_t; div_t div(int x, int y); +#endif union f2i { float f; @@ -180,10 +182,11 @@ void pd_init(void); #define write rb->write #define strncat rb_strncat + +#ifndef SIMULATOR #define floor rb_floor #define atof rb_atof #define atol rb_atol -#define ftoan rb_ftoan #define sin rb_sin #define cos rb_cos #define log10 rb_log10 @@ -196,7 +199,11 @@ void pd_init(void); #define atan2 rb_atan2 #define sinh rb_sinh #define tan rb_tan +#else +#include <math.h> +#endif +#define ftoan rb_ftoan #define strtok_r rb->strtok_r #define strstr rb->strcasestr |