Index: apps/plugins/superdom.c =================================================================== --- apps/plugins/superdom.c (revision 14194) +++ apps/plugins/superdom.c (working copy) @@ -456,6 +456,7 @@ } void update_score(void) { + rb->lcd_setfont(FONT_SYSFIXED); rb->lcd_set_drawmode(DRMODE_BG|DRMODE_INVERSEVID); rb->lcd_fillrect(5,LCD_HEIGHT-20,105,20); rb->lcd_set_drawmode(DRMODE_SOLID); @@ -467,6 +468,7 @@ calc_strength(COLOUR_DARK, cursor.x, cursor.y)/10, calc_strength(COLOUR_DARK, cursor.x, cursor.y)%10); rb->lcd_putsxy(5,LCD_HEIGHT-10, buf); + rb->lcd_setfont(FONT_UI); } int settings_menu_function(void) { @@ -657,7 +659,6 @@ } int get_number(char* param, int* value) { - //int numbers[3][3] = {{1, 2, 3}, {4, 5, 6}, {7, 8, 9}}; int numbers[3][3]; numbers[0][0] = 1; numbers[0][1] = 2; @@ -682,6 +683,7 @@ NUM_MARGIN_Y+(NUM_BOX_HEIGHT*i)); } int temp = 1; + rb->lcd_setfont(FONT_SYSFIXED); for(i=0;i<3;i++) { for(j=0;j<3;j++) { rb->snprintf(buf, sizeof(buf), "%d", temp); @@ -718,6 +720,7 @@ *value /= 100; } else if(y==3 && x==2) { *value /= 10; + rb->lcd_setfont(FONT_UI); return 0; } rb->lcd_set_drawmode(DRMODE_BG|DRMODE_INVERSEVID); @@ -729,6 +732,7 @@ NUM_MARGIN_Y+4*NUM_BOX_HEIGHT+10, buf); break; case SUPERDOM_CANCEL: + rb->lcd_setfont(FONT_UI); return 0; break; #if CONFIG_KEYPAD != IRIVER_H10_PAD @@ -830,12 +834,14 @@ default: if (rb->default_event_handler(button) == SYS_USB_CONNECTED) { + rb->lcd_setfont(FONT_UI); return PLUGIN_USB_CONNECTED; } break; } rb->lcd_update(); } + rb->lcd_setfont(FONT_UI); return 0; } @@ -1226,6 +1232,60 @@ return 0; } +#if 1 +static char * inventory_data(int selected_item, void* data, char *buffer) +{ + (void)data; + switch(selected_item) { + case 0: + rb->snprintf(buffer,MAX_PATH, "Inventory"); + break; + case 1: + rb->snprintf(buffer,MAX_PATH," Men: %d", humanres.men); + break; + case 2: + rb->snprintf(buffer,MAX_PATH," Tanks: %d", humanres.men); + break; + case 3: + rb->snprintf(buffer,MAX_PATH," Planes: %d", humanres.planes); + break; + case 4: + rb->snprintf(buffer,MAX_PATH," Factories: %d", + humanres.inds); + break; + case 5: + rb->snprintf(buffer,MAX_PATH," Farms: %d", humanres.farms); + break; + case 6: + rb->snprintf(buffer,MAX_PATH," Nukes: %d", humanres.nukes); + break; + case 7: + rb->snprintf(buffer,MAX_PATH," Cash: %d", humanres.cash); + break; + case 8: + rb->snprintf(buffer,MAX_PATH," Food: %d", humanres.food); + break; + case 9: + rb->snprintf(buffer,MAX_PATH," Bank: %d", humanres.bank); + break; + } + return buffer; +} + +int show_inventory(void) +{ + struct gui_synclist inventory_list; + + rb->gui_synclist_init(&inventory_list, &inventory_data, NULL, true, 1); + rb->gui_synclist_set_nb_items(&inventory_list,10); + rb->gui_synclist_draw(&inventory_list); + if(rb->default_event_handler(rb->button_get(true)) == SYS_USB_CONNECTED) { + return PLUGIN_USB_CONNECTED; + } else { + return 0; + } +} +#else int show_inventory(void) { rb->lcd_clear_display(); rb->lcd_puts(1, 0, "Inventory"); @@ -1256,6 +1316,7 @@ return 0; } } +#endif int production_menu(void) { int selection, tempbank, tempmenu; @@ -1371,6 +1432,7 @@ } int select_square(void) { + rb->lcd_setfont(FONT_SYSFIXED); draw_board(); draw_cursor(); update_score(); @@ -1386,9 +1448,11 @@ button = rb->button_get(true); switch(button) { case SUPERDOM_CANCEL: + rb->lcd_setfont(FONT_UI); return 0; break; case SUPERDOM_OK: + rb->lcd_setfont(FONT_UI); return 2; break; #if CONFIG_KEYPAD != IRIVER_H10_PAD @@ -1466,6 +1530,7 @@ default: if (rb->default_event_handler(button) == SYS_USB_CONNECTED) { + rb->lcd_setfont(FONT_UI); return PLUGIN_USB_CONNECTED; } }