frontend: allow sstates without cd img

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index c1ceb57..29d2c25 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -1,5 +1,5 @@
 /*
- * (C) notaz, 2010-2011
+ * (C) notaz, 2010-2012
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
@@ -252,6 +252,22 @@ do_state_slot:
                toggle_fast_forward(0);
                plugin_call_rearmed_cbs();
                break;
+       case SACTION_TOGGLE_FPS:
+               if ((g_opts & (OPT_SHOWFPS|OPT_SHOWCPU))
+                   == (OPT_SHOWFPS|OPT_SHOWCPU))
+                       g_opts &= ~(OPT_SHOWFPS|OPT_SHOWCPU);
+               else if (g_opts & OPT_SHOWFPS)
+                       g_opts |= OPT_SHOWCPU;
+               else
+                       g_opts |= OPT_SHOWFPS;
+               break;
+       case SACTION_TOGGLE_FULLSCREEN:
+               g_fullscreen = !g_fullscreen;
+               if (GPU_open != NULL && GPU_close != NULL) {
+                       GPU_close();
+                       GPU_open(&gpuDisp, "PCSX", NULL);
+               }
+               break;
        case SACTION_SCREENSHOT:
                {
                        char buf[MAXPATHLEN];
@@ -396,7 +412,7 @@ out:
        fclose(f);
 }
 
-void emu_on_new_cd(void)
+void emu_on_new_cd(int show_hud_msg)
 {
        ClearAllCheats();
        parse_cwcheat();
@@ -406,8 +422,10 @@ void emu_on_new_cd(void)
                printf("----------------------------------------------------------\n");
        }
 
-       snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG);
-       hud_new_msg = 3;
+       if (show_hud_msg) {
+               snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG);
+               hud_new_msg = 3;
+       }
 }
 
 int emu_core_preinit(void)
@@ -563,11 +581,17 @@ int main(int argc, char *argv[])
                                printf(_("Could not load CD-ROM!\n"));
                                return -1;
                        }
-                       emu_on_new_cd();
+                       emu_on_new_cd(!loadst);
                        ready_to_go = 1;
                }
        }
 
+       if (loadst_f) {
+               int ret = LoadState(loadst_f);
+               printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f);
+               ready_to_go |= ret == 0;
+       }
+
        if (ready_to_go) {
                menu_prepare_emu();
 
@@ -576,10 +600,6 @@ int main(int argc, char *argv[])
                        int ret = emu_load_state(loadst - 1);
                        printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
                }
-               if (loadst_f) {
-                       int ret = LoadState(loadst_f);
-                       printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f);
-               }
        }
        else
                menu_loop();
@@ -721,6 +741,8 @@ int emu_load_state(int slot)
        char fname[MAXPATHLEN];
        int ret;
 
+       hud_msg[0] = 0;
+
        ret = get_state_filename(fname, sizeof(fname), slot);
        if (ret != 0)
                return ret;