The-Homebrew-Cloud/fbzx-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/fbzx-wii.git synced 2024-11-24 17:16:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved poke gui, fixed a bug in virtual keyboard

Browse Source
This commit is contained in:
fabio.olimpieri 2012-08-19 21:56:24 +00:00
parent 0c7d82f0b2
commit 46ca256bca
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/VirtualKeyboard.c
View File

@ -179,7 +179,7 @@ struct virtkey* get_key()
key = get_key_internal(); key = get_key_internal();
//clean_screen(); SDL_FillRect(VirtualKeyboard.screen, &rect, SDL_MapRGB(ordenador.screen->format, 0, 0, 0));
return key; return key;
} }

37
src/gui_sdl.c
View File

@ -51,7 +51,7 @@ extern FILE *fdebug;
#endif #endif
#define MAX_POKE 20 #define MAX_POKE 20
#define MAX_TRAINER 40 #define MAX_TRAINER 50
extern int countdown; extern int countdown;
void clean_screen(); void clean_screen();
@ -1135,19 +1135,23 @@ void do_poke_sdl() {
} }
int parse_poke (const char *filename) int parse_poke (const char *filename)
{ {
static unsigned char old_poke[MAX_TRAINER][MAX_POKE]; //Max 19 Pokes per trainer and max 40 trainer static unsigned char old_poke[MAX_TRAINER][MAX_POKE]; //Max 19 Pokes per trainer and max 50 trainer
FILE* fpoke; FILE* fpoke;
unsigned char title[128], flag, newfile, restore, old_mport1; unsigned char title[128], flag, newfile, restore, old_mport1;
int bank, address, value, original_value, ritorno,y,k, trainer, poke; int bank, address, value, original_value, ritorno,y,k, trainer, poke;
SDL_Rect src; SDL_Rect src, banner;
src.x=0; src.x=0;
src.y=0; src.y=30/RATIO;
src.w=640/RATIO; src.w=FULL_DISPLAY_X;
src.h=20/RATIO; src.h=FULL_DISPLAY_Y-60/RATIO;
banner.x=0;
banner.y=30/RATIO;
banner.w=FULL_DISPLAY_X;
banner.h=20/RATIO;
y=60/RATIO; y=60/RATIO;
@ -1165,7 +1169,9 @@ if (fpoke==NULL)
clean_screen(); clean_screen();
print_font(screen, 0xd0, 0xd0, 0xd0,0, 30/RATIO, "Press 1 to deselect, 2 to select", 16); SDL_FillRect(screen, &src, SDL_MapRGB(screen->format, 0xff, 0xff, 0xff));
print_font(screen, 0x0, 0x0, 0x0,0, 30/RATIO, "Press 1 to deselect, 2 to select", 16);
ritorno=0; ritorno=0;
do do
@ -1180,7 +1186,7 @@ do
if (strlen(title)>1) title[strlen(title)-2]='\0'; //cancel new line and line feed if (strlen(title)>1) title[strlen(title)-2]='\0'; //cancel new line and line feed
if (y>450/RATIO) {clean_screen();y=40/RATIO;} if (y>420/RATIO) {SDL_FillRect(screen, &src, SDL_MapRGB(screen->format, 0xff, 0xff, 0xff));y=40/RATIO;}
if (newfile) print_font(screen, 0x80, 0x80, 0x80,0, y, title+1, 16); if (newfile) print_font(screen, 0x80, 0x80, 0x80,0, y, title+1, 16);
else {if (old_poke[trainer][0]==0) print_font(screen, 0xd0, 0, 0,0, y, title+1, 16); //In row 0 information on trainer selection else {if (old_poke[trainer][0]==0) print_font(screen, 0xd0, 0, 0,0, y, title+1, 16); //In row 0 information on trainer selection
@ -1192,13 +1198,13 @@ do
while (!((k & KEY_ESCAPE)||(k & KEY_SELECT))) while (!((k & KEY_ESCAPE)||(k & KEY_SELECT)))
{k = menu_wait_key_press();} {k = menu_wait_key_press();}
src.y=y; banner.y=y;
SDL_FillRect(screen, &src, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, &banner, SDL_MapRGB(screen->format, 0xff, 0xff, 0xff));
if (k & KEY_SELECT) if (k & KEY_SELECT)
{ {
print_font(screen, 0, 0x80, 0,0, y, title+1, 16); print_font(screen, 0, 0x40, 0,0, y, title+1, 16);
old_poke[trainer][0]=1; old_poke[trainer][0]=1;
} }
else else
@ -1260,7 +1266,7 @@ while (ritorno==0);
k=0; k=0;
while (!(k & KEY_ESCAPE)) while (!(k & KEY_ESCAPE)&&(ritorno==0))
{k = menu_wait_key_press();} {k = menu_wait_key_press();}
fclose(fpoke); fclose(fpoke);
@ -1317,8 +1323,6 @@ static void tools()
set_port(submenus[0]); set_port(submenus[0]);
do
{
switch(opt) switch(opt)
{ {
case 0: // Show keyboard case 0: // Show keyboard
@ -1336,13 +1340,12 @@ static void tools()
case 8: // Load poke file case 8: // Load poke file
load_poke_file(); load_poke_file();
break; break;
case 10: case 13:
help(); help();
break; break;
default: default:
break; break;
} }
} while (opt == 10);
} }