From 49cc257e8d0597403119a015eba95adc5ac3a16d Mon Sep 17 00:00:00 2001 From: Nebuleon Fumika Date: Wed, 27 Feb 2013 19:01:09 -0500 Subject: Remove unneeded functions in draw.c. --- source/nds/draw.c | 87 ------------------------------------------------------- source/nds/draw.h | 3 -- 2 files changed, 90 deletions(-) diff --git a/source/nds/draw.c b/source/nds/draw.c index 19720e5..961a8b0 100644 --- a/source/nds/draw.c +++ b/source/nds/draw.c @@ -922,93 +922,6 @@ u32 draw_hotkey_dialog(enum SCREEN_ID screen, u32 sy, char *clear, char *cancel) return TotalKeys; } -/* -* Drawing progress bar -*/ -static enum SCREEN_ID _progress_screen_id; -static int progress_total; -static int progress_current; -static char progress_message[256]; - -// progress bar initialize -void init_progress(enum SCREEN_ID screen, u32 total, char *text) -{ - void* screen_addr; - - _progress_screen_id = screen; - if(_progress_screen_id & UP_MASK) - screen_addr = up_screen_addr; - else - screen_addr = down_screen_addr; - - progress_current = 0; - progress_total = total; -// strcpy(progress_message, text); - -// draw_dialog(progress_sx - 8, progress_sy -29, progress_ex + 8, progress_ey + 13); - -// boxfill(progress_sx - 1, progress_sy - 1, progress_ex + 1, progress_ey + 1, 0); - -// if (text[0] != '\0') -// print_string_center(progress_sy - 21, COLOR_PROGRESS_TEXT, COLOR_DIALOG, text); - - drawboxfill((unsigned short*)screen_addr, progress_sx, progress_sy, progress_ex, - progress_ey, COLOR16(15, 15, 15)); - - ds2_flipScreen(_progress_screen_id, 2); -} - -// update progress bar -void update_progress(void) -{ - void* screen_addr; - - if(_progress_screen_id & UP_MASK) - screen_addr = up_screen_addr; - else - screen_addr = down_screen_addr; - - int width = (int)( ((float)++progress_current / (float)progress_total) * ((float)SCREEN_WIDTH / 3.0 * 2.0) ); - -// draw_dialog(progress_sx - 8, progress_sy -29, progress_ex + 8, progress_ey + 13); - -// boxfill(progress_sx - 1, progress_sy - 1, progress_ex + 1, progress_ey + 1, COLOR_BLACK); -// if (progress_message[0] != '\0') -// print_string_center(progress_sy - 21, COLOR_PROGRESS_TEXT, COLOR_DIALOG, progress_message); - - drawboxfill(screen_addr, progress_sx, progress_sy, progress_sx+width, progress_ey, COLOR16(30, 19, 7)); - - ds2_flipScreen(_progress_screen_id, 2); -} - -// display progress string -void show_progress(char *text) -{ - void* screen_addr; - - if(_progress_screen_id & UP_MASK) - screen_addr = up_screen_addr; - else - screen_addr = down_screen_addr; - -// draw_dialog(progress_sx - 8, progress_sy -29, progress_ex + 8, progress_ey + 13); -// boxfill(progress_sx - 1, progress_sy - 1, progress_ex + 1, progress_ey + 1, COLOR_BLACK); - - if (progress_current) - { - int width = (int)( (float)(++progress_current / progress_total) * (float)(SCREEN_WIDTH / 3.0 * 2.0) ); - drawboxfill(screen_addr, progress_sx, progress_sy, progress_sx+width, progress_ey, COLOR16(30, 19, 7)); - } - -// if (text[0] != '\0') -// print_string_center(progress_sy - 21, COLOR_PROGRESS_TEXT, COLOR_DIALOG, text); - - ds2_flipScreen(_progress_screen_id, 2); - -// OSTimeDly(progress_wait); - mdelay(500); -} - /* * Drawing scroll bar */ diff --git a/source/nds/draw.h b/source/nds/draw.h index 3bc26c1..dc34bf7 100644 --- a/source/nds/draw.h +++ b/source/nds/draw.h @@ -167,9 +167,6 @@ extern u32 draw_hscroll_init(void* screen_address, u32 sx, u32 sy, u32 width, extern u32 draw_hscroll(u32 index, s32 scroll_val); extern void draw_hscroll_over(u32 index); extern void boxfill_alpha(u32 sx, u32 sy, u32 ex, u32 ey, u32 color, u32 alpha); -extern void init_progress(enum SCREEN_ID screen, u32 total, char *text); -extern void update_progress(void); -extern void show_progress(char *text); extern void scrollbar(void* screen_addr, u32 sx, u32 sy, u32 ex, u32 ey, u32 all, u32 view, u32 now); extern u32 yesno_dialog(char *text); extern u32 draw_yesno_dialog(enum SCREEN_ID screen, u32 sy, char *yes, char *no); -- cgit v1.2.3