moparisthebest
/
alt64
mirror of https://github.com/parasyte/alt64
1
0
Fork 0
Code Issues Releases Wiki Activity

changed input_mapping to use case statements

This commit is contained in:
Robin Jones 2016-12-30 13:43:41 +00:00
parent 2025c86b47
commit f765603e76
1 changed files with 268 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

368
src/menu.c
View File

@ -1861,6 +1861,9 @@ void view_mpk(display_context_t disp)
case ACCESSORY_RUMBLEPAK: case ACCESSORY_RUMBLEPAK:
printText("rumblepak inserted", 11, -1, disp); printText("rumblepak inserted", 11, -1, disp);
break; break;
default:
break;
} }
} }
@ -2445,6 +2448,9 @@ int readCheatFile(char *filename, u32 *cheat_lists[2])
// And we're outta here! // And we're outta here!
done = 1; done = 1;
break; break;
default:
break;
} }
yaml_event_delete(&event); yaml_event_delete(&event);
@ -2847,6 +2853,9 @@ void alterRomConfig(int type, int mode)
rom_config[7]--; rom_config[7]--;
} }
break; break;
default:
break;
} }
} }
@ -3478,6 +3487,9 @@ void handleInput(display_context_t disp, sprite_t *contr)
input_mapping = toplist; input_mapping = toplist;
sleep(80); sleep(80);
break; break;
default:
break;
} }
} }
@ -3548,6 +3560,9 @@ void handleInput(display_context_t disp, sprite_t *contr)
input_mapping = toplist; input_mapping = toplist;
sleep(80); sleep(80);
break; break;
default:
break;
} }
} }
else if (keys.c[0].left || keys_held.c[0].left || keys_held.c[0].x < -25) else if (keys.c[0].left || keys_held.c[0].left || keys_held.c[0].x < -25)
@ -3594,12 +3609,17 @@ void handleInput(display_context_t disp, sprite_t *contr)
input_mapping = rom_config_box; input_mapping = rom_config_box;
sleep(80); sleep(80);
break; break;
default:
break;
} }
} }
else if (keys.c[0].right || keys_held.c[0].right || keys_held.c[0].x > +25) else if (keys.c[0].right || keys_held.c[0].right || keys_held.c[0].x > +25)
{ {
if (input_mapping == file_manager) switch (input_mapping)
{ {
case file_manager:
if (select_mode) if (select_mode)
{ {
if ((count != 0) && if ((count != 0) &&
@ -3620,17 +3640,19 @@ void handleInput(display_context_t disp, sprite_t *contr)
display_show(disp); display_show(disp);
} }
} break;
else if (input_mapping == mempak_menu)
{ case mempak_menu:
} break;
else if (input_mapping == char_input)
{ case char_input:
//chr input screen //chr input screen
set = 2; set = 2;
} break;
else if (input_mapping == rom_config_box)
{ case rom_config_box:
while (!(disp = display_lock())) while (!(disp = display_lock()))
; ;
@ -3644,12 +3666,18 @@ void handleInput(display_context_t disp, sprite_t *contr)
display_show(disp); display_show(disp);
input_mapping = rom_config_box; input_mapping = rom_config_box;
sleep(80); sleep(80);
break;
default:
break;
} }
} }
else if (keys.c[0].start) else if (keys.c[0].start)
{ {
if (input_mapping == file_manager) switch (input_mapping)
{ {
case file_manager:
//quick boot //quick boot
if (quick_boot) if (quick_boot)
{ {
@ -3688,12 +3716,13 @@ void handleInput(display_context_t disp, sprite_t *contr)
{ {
loadFile(disp); loadFile(disp);
} }
} break;
else if (input_mapping == mempak_menu)
{ case mempak_menu:
} break;
else if (input_mapping == char_input)
{ case char_input:
//better config color-set //better config color-set
graphics_set_color( graphics_set_color(
graphics_make_color(0xFF, 0xFF, 0xFF, 0xFF), graphics_make_color(0xFF, 0xFF, 0xFF, 0xFF),
@ -3722,21 +3751,28 @@ void handleInput(display_context_t disp, sprite_t *contr)
} }
input_mapping = file_manager; input_mapping = file_manager;
} break;
else if (input_mapping == rom_loaded)
{ case rom_loaded:
//rom start screen //rom start screen
//normal boot //normal boot
//boot the loaded rom //boot the loaded rom
bootRom(disp, 0); bootRom(disp, 0);
//never return //never return
break;
default:
break;
} }
} }
else if (keys.c[0].L) else if (keys.c[0].L)
{ {
if (input_mapping == file_manager) switch (input_mapping)
{ {
case file_manager:
input_mapping = mempak_menu; input_mapping = mempak_menu;
drawBoxNumber(disp, 2); drawBoxNumber(disp, 2);
@ -3756,37 +3792,46 @@ void handleInput(display_context_t disp, sprite_t *contr)
if (sound_on) if (sound_on)
playSound(2); playSound(2);
sleep(500); sleep(500);
} break;
else if (input_mapping == mempak_menu)
{ case mempak_menu:
} break;
else if (input_mapping == char_input)
{ case char_input:
//chr input screen //chr input screen
drawInputDel(disp); drawInputDel(disp);
} break;
else if (input_mapping == mpk_choice)
{ case mpk_choice:
//c-up or A //c-up or A
drawConfirmBox(disp); drawConfirmBox(disp);
//confirm restore mpk //confirm restore mpk
input_mapping = mpk_restore; input_mapping = mpk_restore;
break;
default:
break;
} }
} }
else if (keys.c[0].R) else if (keys.c[0].R)
{ {
if (input_mapping == file_manager) switch (input_mapping)
{
}
else if (input_mapping == mempak_menu)
{ {
case file_manager:
break;
case mempak_menu:
//c-up or A //c-up or A
drawConfirmBox(disp); drawConfirmBox(disp);
//confirm format mpk //confirm format mpk
input_mapping = mpk_format; input_mapping = mpk_format;
} break;
else if (input_mapping == char_input)
{ case char_input:
//chr input screen //chr input screen
if (set == 1) if (set == 1)
drawInputAdd(disp, "A"); //P X ) drawInputAdd(disp, "A"); //P X )
@ -3796,19 +3841,26 @@ void handleInput(display_context_t disp, sprite_t *contr)
drawInputAdd(disp, "O"); drawInputAdd(disp, "O");
if (set == 4) if (set == 4)
drawInputAdd(disp, "V"); drawInputAdd(disp, "V");
} break;
else if (input_mapping == mpk_choice)
{ case mpk_choice:
//c-up or A //c-up or A
drawConfirmBox(disp); drawConfirmBox(disp);
//confirm quick-backup //confirm quick-backup
input_mapping = mpk_quick_backup; input_mapping = mpk_quick_backup;
break;
default:
break;
} }
} }
else if (keys.c[0].C_up) else if (keys.c[0].C_up)
{ {
if (input_mapping == file_manager) switch (input_mapping)
{ {
case file_manager:
if (list[cursor].type != DT_DIR && empty == 0) if (list[cursor].type != DT_DIR && empty == 0)
{ {
drawBoxNumber(disp, 11); drawBoxNumber(disp, 11);
@ -3831,12 +3883,13 @@ void handleInput(display_context_t disp, sprite_t *contr)
free(part); free(part);
input_mapping = abort_screen; input_mapping = abort_screen;
} }
} break;
else if (input_mapping == mempak_menu)
{ case mempak_menu:
} break;
else if (input_mapping == char_input)
{ case char_input:
//chr input screen //chr input screen
if (set == 1) if (set == 1)
drawInputAdd(disp, "B"); //P X ) drawInputAdd(disp, "B"); //P X )
@ -3846,18 +3899,20 @@ void handleInput(display_context_t disp, sprite_t *contr)
drawInputAdd(disp, "P"); drawInputAdd(disp, "P");
if (set == 4) if (set == 4)
drawInputAdd(disp, "W"); drawInputAdd(disp, "W");
} break;
else if (input_mapping == rom_loaded)
{ case rom_loaded:
//rom start screen //rom start screen
if (cheats_on == 0) if (cheats_on == 0)
{ {
printText("cheat system activated...", 3, -1, disp); printText("cheat system activated...", 3, -1, disp);
cheats_on = 1; cheats_on = 1;
} }
} break;
else if (input_mapping == mpk_format)
{ // format mpk case mpk_format:
// format mpk
drawBoxNumber(disp, 2); drawBoxNumber(disp, 2);
display_show(disp); display_show(disp);
@ -3894,9 +3949,10 @@ void handleInput(display_context_t disp, sprite_t *contr)
sleep(500); sleep(500);
input_mapping = abort_screen; input_mapping = abort_screen;
} break;
else if (input_mapping == mpk_restore)
{ //restore mpk case mpk_restore:
//restore mpk
drawBoxNumber(disp, 2); drawBoxNumber(disp, 2);
display_show(disp); display_show(disp);
@ -3910,9 +3966,10 @@ void handleInput(display_context_t disp, sprite_t *contr)
input_mapping = abort_screen; input_mapping = abort_screen;
display_show(disp); display_show(disp);
} break;
else if (input_mapping == mpk_quick_backup)
{ //quick-backup case mpk_quick_backup:
//quick-backup
drawBoxNumber(disp, 2); drawBoxNumber(disp, 2);
display_show(disp); display_show(disp);
@ -3926,11 +3983,19 @@ void handleInput(display_context_t disp, sprite_t *contr)
drawShortInfoBox(disp, " done", 0); drawShortInfoBox(disp, " done", 0);
sleep(500); sleep(500);
input_mapping = abort_screen; input_mapping = abort_screen;
break;
default:
break;
} }
} }
else if (keys.c[0].C_right) else if (keys.c[0].C_right)
{ {
if (input_mapping == file_manager && list[cursor].type != DT_DIR) switch (input_mapping)
{
case file_manager:
if (list[cursor].type != DT_DIR)
{ {
//show rom cfg screen //show rom cfg screen
@ -3945,7 +4010,7 @@ void handleInput(display_context_t disp, sprite_t *contr)
* 1 rom * 1 rom
*/ */
int ft = 0; //TODO: this code is very similar to that used in loadFile, we should move it to a seperate function!
char _upper_name_file[64]; char _upper_name_file[64];
strcpy(_upper_name_file, name_file); strcpy(_upper_name_file, name_file);
@ -3960,9 +4025,6 @@ void handleInput(display_context_t disp, sprite_t *contr)
sprintf(extension, "%s", (pch + 1)); //0123456 sprintf(extension, "%s", (pch + 1)); //0123456
if (!strcmp(extension, "Z64") || !strcmp(extension, "V64") || !strcmp(extension, "N64")) if (!strcmp(extension, "Z64") || !strcmp(extension, "V64") || !strcmp(extension, "N64"))
ft = 1;
if (ft == 1)
{ //rom { //rom
//cfg rom //cfg rom
sprintf(rom_filename, "%s", list[cursor].filename); sprintf(rom_filename, "%s", list[cursor].filename);
@ -3975,11 +4037,13 @@ void handleInput(display_context_t disp, sprite_t *contr)
input_mapping = rom_config_box; input_mapping = rom_config_box;
} }
} }
else if (input_mapping == mempak_menu) break;
{
} case mempak_menu:
else if (input_mapping == char_input) break;
{
case char_input:
//chr input screen //chr input screen
if (set == 1) if (set == 1)
drawInputAdd(disp, "D"); //P X ) drawInputAdd(disp, "D"); //P X )
@ -3989,21 +4053,28 @@ void handleInput(display_context_t disp, sprite_t *contr)
drawInputAdd(disp, "R"); drawInputAdd(disp, "R");
if (set == 4) if (set == 4)
drawInputAdd(disp, "Y"); drawInputAdd(disp, "Y");
} break;
else if (input_mapping == rom_loaded)
{ case rom_loaded:
//rom start screen //rom start screen
if (force_tv != 0) if (force_tv != 0)
{ {
printText("force tv mode...", 3, -1, disp); printText("force tv mode...", 3, -1, disp);
} }
break;
default:
break;
} }
} }
else if (keys.c[0].C_down) else if (keys.c[0].C_down)
{ {
if (input_mapping == file_manager) switch (input_mapping)
{ {
case file_manager:
input_mapping = unknown; input_mapping = unknown;
scopy(pwd, list_pwd_backup); scopy(pwd, list_pwd_backup);
@ -4017,12 +4088,13 @@ void handleInput(display_context_t disp, sprite_t *contr)
display_show(disp); display_show(disp);
input_mapping = toplist; input_mapping = toplist;
} break;
else if (input_mapping == mempak_menu)
{ case mempak_menu:
} break;
else if (input_mapping == char_input)
{ case char_input:
//chr input screen //chr input screen
if (set == 1) if (set == 1)
drawInputAdd(disp, "F"); //P X ) drawInputAdd(disp, "F"); //P X )
@ -4032,14 +4104,22 @@ void handleInput(display_context_t disp, sprite_t *contr)
drawInputAdd(disp, "T"); drawInputAdd(disp, "T");
if (set == 4) if (set == 4)
drawInputAdd(disp, "-"); //GR Set4 drawInputAdd(disp, "-"); //GR Set4
break;
default:
break;
} }
} }
else if (keys.c[0].C_left) else if (keys.c[0].C_left)
{ {
if (input_mapping == file_manager) switch (input_mapping)
{ {
if (input_mapping == file_manager && list[cursor].type != DT_DIR) case file_manager:
{ //open
if (list[cursor].type != DT_DIR)
{
//TODO: this code is similar (if not the same) as loadFile and can be optimised!
//open
char name_file[64]; char name_file[64];
if (strcmp(pwd, "/") == 0) if (strcmp(pwd, "/") == 0)
@ -4110,12 +4190,13 @@ void handleInput(display_context_t disp, sprite_t *contr)
input_mapping = abort_screen; input_mapping = abort_screen;
} }
} //mapping and not dir } //mapping and not dir
} break;
else if (input_mapping == mempak_menu)
{ case mempak_menu:
} break;
else if (input_mapping == char_input)
{ case char_input:
//chr input screen //chr input screen
if (set == 1) if (set == 1)
drawInputAdd(disp, "C"); //P X ) drawInputAdd(disp, "C"); //P X )
@ -4125,20 +4206,24 @@ void handleInput(display_context_t disp, sprite_t *contr)
drawInputAdd(disp, "Q"); drawInputAdd(disp, "Q");
if (set == 4) if (set == 4)
drawInputAdd(disp, "X"); drawInputAdd(disp, "X");
break;
} }
} }
else if (keys.c[0].Z) else if (keys.c[0].Z)
{ {
if (input_mapping == file_manager) switch (input_mapping)
{ {
case file_manager:
input_mapping = unknown; input_mapping = unknown;
showAboutScreen(disp); showAboutScreen(disp);
input_mapping = abort_screen; input_mapping = abort_screen;
} break;
else if (input_mapping == mempak_menu)
{ case mempak_menu:
drawBoxNumber(disp, 4); drawBoxNumber(disp, 4);
display_show(disp); display_show(disp);
view_mpk(disp); view_mpk(disp);
@ -4148,16 +4233,23 @@ void handleInput(display_context_t disp, sprite_t *contr)
sleep(500); sleep(500);
input_mapping = abort_screen; input_mapping = abort_screen;
break;
default:
break;
} }
} }
else if (keys.c[0].A) else if (keys.c[0].A)
{ // open {
if (input_mapping == file_manager) switch (input_mapping)
{
// open
case file_manager:
{ {
while (!(disp = display_lock())) while (!(disp = display_lock()))
; ;
if (input_mapping == file_manager && list[cursor].type == DT_DIR && empty == 0) if (list[cursor].type == DT_DIR && empty == 0)
{ {
char name_dir[256]; char name_dir[256];
@ -4193,19 +4285,21 @@ void handleInput(display_context_t disp, sprite_t *contr)
readSDcard(disp, name_dir); readSDcard(disp, name_dir);
display_show(disp); display_show(disp);
} //mapping 1 and dir } //mapping 1 and dir
else if (input_mapping == file_manager && list[cursor].type != DT_DIR && empty == 0) else if (list[cursor].type != DT_DIR && empty == 0)
{ //open { //open
loadFile(disp); loadFile(disp);
} }
} //mapping 1 end break; //mapping 1 end
else if (input_mapping == mempak_menu) }
case mempak_menu:
{ {
//open up charinput screen //open up charinput screen
input_mapping = char_input; input_mapping = char_input;
input_text[0] = '\0'; input_text[0] = '\0';
graphics_draw_sprite(disp, 0, 0, contr); graphics_draw_sprite(disp, 0, 0, contr);
break;
} }
else if (input_mapping == char_input) case char_input:
{ {
//chr input screen //chr input screen
if (set == 1) if (set == 1)
@ -4216,8 +4310,9 @@ void handleInput(display_context_t disp, sprite_t *contr)
drawInputAdd(disp, "U"); drawInputAdd(disp, "U");
if (set == 4) if (set == 4)
drawInputAdd(disp, "_"); drawInputAdd(disp, "_");
break;
} }
else if (input_mapping == rom_config_box) case rom_config_box:
{ {
//save rom_cfg[] to //save rom_cfg[] to
// /ED64/CFG/Romname.cfg if not exist create // /ED64/CFG/Romname.cfg if not exist create
@ -4261,8 +4356,9 @@ void handleInput(display_context_t disp, sprite_t *contr)
toplist_reload = 1; toplist_reload = 1;
input_mapping = abort_screen; input_mapping = abort_screen;
break;
} }
else if (input_mapping == toplist) case toplist:
{ {
//run from toplist //run from toplist
u8 *pch_s; u8 *pch_s;
@ -4274,8 +4370,9 @@ void handleInput(display_context_t disp, sprite_t *contr)
//rom loaded mapping //rom loaded mapping
input_mapping = rom_loaded; input_mapping = rom_loaded;
break;
} }
else if (input_mapping == abort_screen) case abort_screen:
{ {
//rom info screen //rom info screen
@ -4288,12 +4385,18 @@ void handleInput(display_context_t disp, sprite_t *contr)
display_show(disp); display_show(disp);
input_mapping = file_manager; input_mapping = file_manager;
break;
}
default:
break;
} }
} //key a } //key a
else if (keys.c[0].B) else if (keys.c[0].B)
{ //go back { //go back
if (input_mapping == file_manager) switch (input_mapping)
{ {
case file_manager:
if (!(strcmp(pwd, "/") == 0)) if (!(strcmp(pwd, "/") == 0))
{ {
while (!(disp = display_lock())) while (!(disp = display_lock()))
@ -4360,9 +4463,10 @@ void handleInput(display_context_t disp, sprite_t *contr)
display_show(disp); display_show(disp);
} //not root } //not root
} break;
else if (input_mapping == mempak_menu)
{ case mempak_menu:
while (!(disp = display_lock())) while (!(disp = display_lock()))
; ;
@ -4373,9 +4477,10 @@ void handleInput(display_context_t disp, sprite_t *contr)
display_dir(list, cursor, page, MAX_LIST, count, disp); display_dir(list, cursor, page, MAX_LIST, count, disp);
input_mapping = file_manager; input_mapping = file_manager;
display_show(disp); display_show(disp);
} break;
else if (input_mapping == char_input)
{ case char_input:
//chr input screen //chr input screen
/* Lazy switching */ /* Lazy switching */
@ -4387,9 +4492,14 @@ void handleInput(display_context_t disp, sprite_t *contr)
drawInputAdd(disp, "S"); drawInputAdd(disp, "S");
if (set == 4) if (set == 4)
drawInputAdd(disp, "Z"); drawInputAdd(disp, "Z");
} break;
else if (input_mapping == abort_screen || input_mapping == mpk_format || input_mapping == mpk_restore || input_mapping == rom_config_box || input_mapping == mpk_quick_backup)
{ case abort_screen:
case mpk_format:
case mpk_restore:
case rom_config_box:
case mpk_quick_backup:
//rom info screen //rom info screen
while (!(disp = display_lock())) while (!(disp = display_lock()))
@ -4401,9 +4511,10 @@ void handleInput(display_context_t disp, sprite_t *contr)
display_show(disp); display_show(disp);
input_mapping = file_manager; input_mapping = file_manager;
} break;
else if (input_mapping == toplist)
{ case toplist:
//leave toplist //leave toplist
while (!(disp = display_lock())) while (!(disp = display_lock()))
; ;
@ -4426,9 +4537,10 @@ void handleInput(display_context_t disp, sprite_t *contr)
display_show(disp); display_show(disp);
input_mapping = file_manager; input_mapping = file_manager;
} break;
else if (input_mapping == mp3)
{ case mp3:
//stop mp3 //stop mp3
mp3_Stop(); mp3_Stop();
@ -4440,6 +4552,10 @@ void handleInput(display_context_t disp, sprite_t *contr)
display_show(disp); display_show(disp);
input_mapping = file_manager; input_mapping = file_manager;
break;
default:
break;
} }
} //key b } //key b
} }
@ -4453,13 +4569,7 @@ int main(void)
list = malloc(sizeof(direntry_t)); list = malloc(sizeof(direntry_t));
//dfs init for the rom-attached virtual filesystem //dfs init for the rom-attached virtual filesystem
if (dfs_init(DFS_DEFAULT_LOCATION) != DFS_ESUCCESS) if (dfs_init(DFS_DEFAULT_LOCATION) == DFS_ESUCCESS)
{
printf("Filesystem failed to start!\n");
while (1)
; //never leave!
}
else
{ {
// everdrive initial function // everdrive initial function
configure(); configure();
@ -4544,7 +4654,7 @@ int main(void)
if (sound_on) if (sound_on)
{ {
playSound(1); playSound(1);
for (int s = 0; s < 200; s++) //todo: this blocks! is there a better way before the main loop starts! for (int s = 0; s < 200; s++) //todo: this blocks for 2 seconds (splashscreen)! is there a better way before the main loop starts!
{ {
sndUpdate(); sndUpdate();
sleep(10); sleep(10);
@ -4650,4 +4760,10 @@ int main(void)
//sleep(10); //sleep(10);
} }
} }
else
{
printf("Filesystem failed to start!\n");
while (1)
; //never leave!
}
} }