From b02b6f020dee8322901058895ddc66b78dad1be0 Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Sat, 17 Sep 2016 01:33:06 +0100 Subject: [PATCH] reverted to using if else statements as cant use strings with case statements using c99 --- inc/menu.h | 1 - src/menu.c | 49 +++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/inc/menu.h b/inc/menu.h index 340d7c7..3cb399f 100644 --- a/inc/menu.h +++ b/inc/menu.h @@ -39,7 +39,6 @@ void drawBox(short x, short y, short width, short height, display_context_t disp void drawBoxNumber(display_context_t disp, int box); void printText(char *msg, int x, int y, display_context_t dcon); -void lprintText(char *msg, int x, int y, display_context_t dcon); void sleep(unsigned long int ms); void clearScreen(display_context_t disp); diff --git a/src/menu.c b/src/menu.c index 70125c8..7409bfa 100644 --- a/src/menu.c +++ b/src/menu.c @@ -3778,14 +3778,11 @@ int main(void) sprintf(extension, "%s", (pch + 1)); //0123456 - //load the rom using its extension - switch (extension) + //load the rom using its file extension + if (strcmp(extension, "Z64") == 0 || strcmp(extension, "V64") == 0 || strcmp(extension, "N64") == 0) { - case "Z64": - case "V64": - case "N64": while (!(disp = display_lock())) - ; + ; clearScreen(disp); u16 msg = 0; sleep(300); @@ -3803,11 +3800,11 @@ int main(void) //rom loaded mapping input_mapping = 4; - break; - case "GB": //gb - case "GBC": //gbc rom + } + else if (strcmp(extension, "GB") == 0 || strcmp(extension, "GBC") == 0) + { while (!(disp = display_lock())) - ; + ; clearScreen(disp); u16 msg = 0; sleep(300); @@ -3820,10 +3817,11 @@ int main(void) loadgbrom(disp, name_file); display_show(disp); - break; - case "NES": //nes + } + else if (strcmp(extension, "NES") == 0) + { while (!(disp = display_lock())) - ; + ; clearScreen(disp); u16 msg = 0; sleep(300); @@ -3836,10 +3834,11 @@ int main(void) loadnesrom(disp, name_file); display_show(disp); - break; - case "GG": //gg + } + else if (strcmp(extension, "GG") == 0) + { while (!(disp = display_lock())) - ; + ; clearScreen(disp); u16 msg = 0; sleep(300); @@ -3852,10 +3851,11 @@ int main(void) loadggrom(disp, name_file); display_show(disp); - break; - case "MSX": //msx2 + } + else if (strcmp(extension, "MSX") == 0) + { while (!(disp = display_lock())) - ; + ; clearScreen(disp); u16 msg = 0; sleep(300); @@ -3868,11 +3868,12 @@ int main(void) loadmsx2rom(disp, name_file); display_show(disp); - break; - case "MPK": //mempak - break; - default: - break; + } + else if (strcmp(extension, "MPK") == 0) + { + } + else + { } } }