notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up mmap hacks
[pcsx_rearmed.git]
/
frontend
/
main.c
diff --git
a/frontend/main.c
b/frontend/main.c
index
29df6d9
..
59b68d5
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-31,6
+31,8
@@
#include "libpicofe/input.h"
#include "libpicofe/plat.h"
#include "libpicofe/readpng.h"
#include "libpicofe/input.h"
#include "libpicofe/plat.h"
#include "libpicofe/readpng.h"
+
+static void toggle_fast_forward(int force_off);
#endif
#ifndef BOOT_MSG
#define BOOT_MSG "Booting up..."
#endif
#ifndef BOOT_MSG
#define BOOT_MSG "Booting up..."
@@
-54,8
+56,6
@@
enum sched_action emu_action, emu_action_old;
char hud_msg[64];
int hud_new_msg;
char hud_msg[64];
int hud_new_msg;
-static void toggle_fast_forward(int force_off);
-
static void make_path(char *buf, size_t size, const char *dir, const char *fname)
{
if (fname)
static void make_path(char *buf, size_t size, const char *dir, const char *fname)
{
if (fname)
@@
-263,6
+263,10
@@
do_state_slot:
break;
case SACTION_TOGGLE_FULLSCREEN:
g_fullscreen = !g_fullscreen;
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:
{
break;
case SACTION_SCREENSHOT:
{
@@
-582,6
+586,12
@@
int main(int argc, char *argv[])
}
}
}
}
+ 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();
if (ready_to_go) {
menu_prepare_emu();
@@
-590,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);
}
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();
}
else
menu_loop();