rom_data -> rom_loaded

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index ef54ed6..5ff8ac0 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -169,7 +169,7 @@ void menu_romload_prepare(const char *rom_name)
        const char *p = rom_name + strlen(rom_name);\r
        while (p > rom_name && *p != '/') p--;\r
 \r
-       if (rom_data) gp2x_pd_clone_buffer2();\r
+       if (rom_loaded) gp2x_pd_clone_buffer2();\r
        else memset(gp2x_screen, 0, 320*240*2);\r
 \r
        smalltext_out16(1, 1, "Loading", 0xffff);\r
@@ -215,7 +215,7 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 \r
        gp2x_pd_clone_buffer2();\r
 \r
-       if (rom_data == NULL) {\r
+       if (!rom_loaded) {\r
                menu_darken_bg(gp2x_screen, 320*240, 0);\r
        }\r
 \r
@@ -860,7 +860,7 @@ static void kc_sel_loop(void)
                                case 1: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 1); return;\r
                                case 2: key_config_loop(emuctrl_actions,\r
                                                sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]), -1); return;\r
-                               case 3: if (rom_data == NULL) emu_WriteConfig(0); return;\r
+                               case 3: if (!rom_loaded) emu_WriteConfig(0); return;\r
                                default: return;\r
                        }\r
                }\r
@@ -1294,7 +1294,7 @@ static int menu_loop_options(void)
        currentConfig.PsndRate = PsndRate;\r
        currentConfig.PicoRegion = PicoRegionOverride;\r
 \r
-       me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_SAVECFG_GAME, rom_data != NULL);\r
+       me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_SAVECFG_GAME, rom_loaded);\r
        me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_LOADCFG, config_slot != config_slot_current);\r
        menu_sel_max = me_count_enabled(opt_entries, OPT_ENTRY_COUNT) - 1;\r
        if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;\r
@@ -1485,10 +1485,10 @@ static void menu_loop_root(void)
        int ret, menu_sel_max;\r
        unsigned long inp = 0;\r
 \r
-       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESUME_GAME, rom_data != NULL);\r
-       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_SAVE_STATE,  rom_data != NULL);\r
-       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_LOAD_STATE,  rom_data != NULL);\r
-       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESET_GAME,  rom_data != NULL);\r
+       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESUME_GAME, rom_loaded);\r
+       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_SAVE_STATE,  rom_loaded);\r
+       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_LOAD_STATE,  rom_loaded);\r
+       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESET_GAME,  rom_loaded);\r
        me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_PATCHES,     PicoPatches != NULL);\r
 \r
        menu_sel_max = me_count_enabled(main_entries, MAIN_ENTRY_COUNT) - 1;\r
@@ -1506,7 +1506,7 @@ static void menu_loop_root(void)
                if(inp & GP2X_DOWN)  { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
                if((inp & (GP2X_L|GP2X_R)) == (GP2X_L|GP2X_R)) debug_menu_loop();\r
                if(inp &(GP2X_SELECT|GP2X_X)){\r
-                       if (rom_data) {\r
+                       if (rom_loaded) {\r
                                while (gp2x_joystick_read(1) & (GP2X_SELECT|GP2X_X)) usleep(50*1000); // wait until select is released\r
                                engineState = PGS_Running;\r
                                break;\r
@@ -1516,14 +1516,14 @@ static void menu_loop_root(void)
                        switch (me_index2id(main_entries, MAIN_ENTRY_COUNT, menu_sel))\r
                        {\r
                                case MA_MAIN_RESUME_GAME:\r
-                                       if (rom_data) {\r
+                                       if (rom_loaded) {\r
                                                while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
                                                engineState = PGS_Running;\r
                                                return;\r
                                        }\r
                                        break;\r
                                case MA_MAIN_SAVE_STATE:\r
-                                       if (rom_data) {\r
+                                       if (rom_loaded) {\r
                                                if(savestate_menu_loop(0))\r
                                                        continue;\r
                                                engineState = PGS_Running;\r
@@ -1531,7 +1531,7 @@ static void menu_loop_root(void)
                                        }\r
                                        break;\r
                                case MA_MAIN_LOAD_STATE:\r
-                                       if (rom_data) {\r
+                                       if (rom_loaded) {\r
                                                if(savestate_menu_loop(1))\r
                                                        continue;\r
                                                engineState = PGS_Running;\r
@@ -1539,7 +1539,7 @@ static void menu_loop_root(void)
                                        }\r
                                        break;\r
                                case MA_MAIN_RESET_GAME:\r
-                                       if (rom_data) {\r
+                                       if (rom_loaded) {\r
                                                emu_ResetGame();\r
                                                engineState = PGS_Running;\r
                                                return;\r
@@ -1582,7 +1582,7 @@ static void menu_loop_root(void)
                                        engineState = PGS_Quit;\r
                                        return;\r
                                case MA_MAIN_PATCHES:\r
-                                       if (rom_data && PicoPatches) {\r
+                                       if (rom_loaded && PicoPatches) {\r
                                                patches_menu_loop();\r
                                                PicoPatchApply();\r
                                                strcpy(menuErrorMsg, "Patches applied");\r
@@ -1641,7 +1641,7 @@ static void menu_prepare_bg(int use_game_bg)
 \r
 static void menu_gfx_prepare(void)\r
 {\r
-       menu_prepare_bg(rom_data != NULL);\r
+       menu_prepare_bg(rom_loaded);\r
 \r
        // switch to 16bpp\r
        gp2x_video_changemode2(16);\r