From 7ae053a6e900835b787b312c853f3a0768bc073d Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Mon, 13 May 2002 12:45:46 +0000 Subject: Changing to C99 'bool' git-svn-id: svn://svn.rockbox.org/rockbox/trunk@562 a1c6a512-1295-4272-9138-f99709370657 --- uisimulator/app.c | 1 - uisimulator/common/mpegplay.c | 1 - uisimulator/menu.c | 1 - uisimulator/play.c | 7 +++---- uisimulator/screensaver.c | 1 - uisimulator/tetris.c | 36 ++++++++++++++++++------------------ uisimulator/tree.c | 22 ++++++++++------------ uisimulator/x11/button-x11.c | 1 - 8 files changed, 31 insertions(+), 39 deletions(-) (limited to 'uisimulator') diff --git a/uisimulator/app.c b/uisimulator/app.c index 5c96ab8c43..c5149d8171 100644 --- a/uisimulator/app.c +++ b/uisimulator/app.c @@ -17,7 +17,6 @@ * ****************************************************************************/ -#include "types.h" #include "lcd.h" #include "button.h" #include "kernel.h" diff --git a/uisimulator/common/mpegplay.c b/uisimulator/common/mpegplay.c index aaaddfa014..5ecfca9e97 100644 --- a/uisimulator/common/mpegplay.c +++ b/uisimulator/common/mpegplay.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include "id3.h" diff --git a/uisimulator/menu.c b/uisimulator/menu.c index dcaa1f5fca..6a6b61e755 100644 --- a/uisimulator/menu.c +++ b/uisimulator/menu.c @@ -17,7 +17,6 @@ * ****************************************************************************/ -#include "types.h" #include "lcd.h" #include "menu.h" diff --git a/uisimulator/play.c b/uisimulator/play.c index 3681a7e133..e93f17672e 100644 --- a/uisimulator/play.c +++ b/uisimulator/play.c @@ -20,10 +20,9 @@ #include #include -#include -#include -#include -#include +#include "file.h" +#include "lcd.h" +#include "button.h" #include "kernel.h" #include "tree.h" #include "debug.h" diff --git a/uisimulator/screensaver.c b/uisimulator/screensaver.c index a85ccf965d..b8144478e2 100644 --- a/uisimulator/screensaver.c +++ b/uisimulator/screensaver.c @@ -20,7 +20,6 @@ #ifdef HAVE_LCD_BITMAP #include "screensaver.h" -#include "types.h" #include "lcd.h" #include "button.h" #include "kernel.h" diff --git a/uisimulator/tetris.c b/uisimulator/tetris.c index 8884fd8964..24090eb67e 100644 --- a/uisimulator/tetris.c +++ b/uisimulator/tetris.c @@ -20,8 +20,7 @@ ****************************************************************************/ #ifdef HAVE_LCD_BITMAP - -#include "types.h" +#include #include "lcd.h" #include "button.h" #include "kernel.h" @@ -121,7 +120,7 @@ void draw_frame(int fstart_x,int fstop_x,int fstart_y,int fstop_y) lcd_drawline(fstop_x, fstart_y, fstop_x, fstop_y); } -void draw_block(int x,int y,int block,int frame,int clear) +void draw_block(int x,int y,int block,int frame,bool clear) { int i; for(i=0;i < 4;i++) { @@ -143,7 +142,7 @@ void to_virtual() (current_x+block_data[current_b][current_f][0][i])) = current_b+1; } -int gameover() +bool gameover() { int i; int frame, block, y, x; @@ -162,14 +161,14 @@ int gameover() if(y+block_data[block][frame][1][i] < start_y) { /* Game over ;) */ - return TRUE; + return true; } } } - return FALSE; + return false; } -int valid_position(int x,int y,int block,int frame) +bool valid_position(int x,int y,int block,int frame) { int i; for(i=0;i < 4;i++) @@ -179,8 +178,8 @@ int valid_position(int x,int y,int block,int frame) (x+block_data[block][frame][0][i] > max_x-1) || (y+block_data[block][frame][1][i] < 0) || (y+block_data[block][frame][1][i] > max_y-1)) - return FALSE; - return TRUE; + return false; + return true; } void from_virtual() @@ -207,10 +206,10 @@ void move_block(int x,int y,int f) } if(valid_position(current_x+x,current_y+y,current_b,current_f)) { - draw_block(current_x,current_y,current_b,last_frame,TRUE); + draw_block(current_x,current_y,current_b,last_frame,true); current_x += x; current_y += y; - draw_block(current_x,current_y,current_b,current_f,FALSE); + draw_block(current_x,current_y,current_b,current_f,false); lcd_update(); } else @@ -225,27 +224,28 @@ void new_block() current_y = 0; next_b = t_rand(blocks); next_f = t_rand(block_frames[next_b]); - draw_block(max_x+2,start_y-1,current_b,current_f,TRUE); - draw_block(max_x+2,start_y-1,next_b,next_f,FALSE); + draw_block(max_x+2,start_y-1,current_b,current_f,true); + draw_block(max_x+2,start_y-1,next_b,next_f,false); if(!valid_position(current_x,current_y,current_b,current_f)) { - draw_block(current_x,current_y,current_b,current_f,FALSE); + draw_block(current_x,current_y,current_b,current_f,false); lcd_update(); } else - draw_block(current_x,current_y,current_b,current_f,FALSE); + draw_block(current_x,current_y,current_b,current_f,false); } int check_lines() { - int x,y,line,i; + int x,y,i; + bool line; int lines = 0; for(y=0;y < max_y;y++) { - line = TRUE; + line = true; for(x=0;x < max_x;x++) if(virtual[y*max_x+x] == 0) - line = FALSE; + line = false; if(line) { lines++; diff --git a/uisimulator/tree.c b/uisimulator/tree.c index 0382547590..1941661bb7 100644 --- a/uisimulator/tree.c +++ b/uisimulator/tree.c @@ -19,24 +19,22 @@ #include #include +#include -#include -#include -#include -#include -#include +#include "dir.h" +#include "file.h" +#include "lcd.h" +#include "button.h" #include "kernel.h" #include "tree.h" - #include "icons.h" - #include "play.h" #define TREE_MAX_FILENAMELEN 128 struct entry { - int file; /* TRUE if file, FALSE if dir */ + int file; /* true if file, false if dir */ char name[TREE_MAX_FILENAMELEN]; int namelen; }; @@ -110,7 +108,7 @@ int static showdir(char *path, struct entry *buffer, int start, else icon_type=Folder; lcd_bitmap(bitmap_icons_6x8[icon_type], 6, MARGIN_Y+i*LINE_HEIGTH, 6, - 8, TRUE); + 8, true); #endif if(len < TREE_MAX_LEN_DISPLAY) @@ -177,13 +175,13 @@ bool dirbrowse(char *root) } switch(key) { case BUTTON_OFF: - return FALSE; + return false; break; case BUTTON_LEFT: i=strlen(currdir); if (i==1) { - return FALSE; + return false; } else { while (currdir[i-1]!='/') @@ -286,5 +284,5 @@ bool dirbrowse(char *root) } } - return FALSE; + return false; } diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c index dc077f03b1..c3afa4b42a 100644 --- a/uisimulator/x11/button-x11.c +++ b/uisimulator/x11/button-x11.c @@ -16,7 +16,6 @@ * KIND, either express or implied. * ****************************************************************************/ -#include "types.h" #include "button.h" #include "X11/keysym.h" -- cgit v1.2.3