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
cdriso: handle eboot and it's TOC, some refactoring
[pcsx_rearmed.git]
/
frontend
/
main.c
diff --git
a/frontend/main.c
b/frontend/main.c
index
f97610a
..
6a37bef
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-36,9
+36,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;
-// from softgpu plugin
-extern int UseFrameSkip;
-
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)
@@
-97,7
+94,7
@@
void set_cd_image(const char *fname)
if (ext && (
strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 ||
if (ext && (
strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 ||
- strcasecmp(ext, ".znx") == 0
|| strcasecmp(ext, ".pbp") == 0
)) {
+ strcasecmp(ext, ".znx") == 0
/*|| strcasecmp(ext, ".pbp") == 0*/
)) {
SetIsoFile(NULL);
cdrcimg_set_fname(fname);
strcpy(Config.Cdr, "builtin_cdrcimg");
SetIsoFile(NULL);
cdrcimg_set_fname(fname);
strcpy(Config.Cdr, "builtin_cdrcimg");
@@
-157,9
+154,9
@@
void do_emu_action(void)
state_slot = 9;
goto do_state_slot;
case SACTION_TOGGLE_FSKIP:
state_slot = 9;
goto do_state_slot;
case SACTION_TOGGLE_FSKIP:
-
UseFrameS
kip ^= 1;
+
pl_rearmed_cbs.frames
kip ^= 1;
snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP %s",
snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP %s",
-
UseFrameS
kip ? "ON" : "OFF");
+
pl_rearmed_cbs.frames
kip ? "ON" : "OFF");
break;
case SACTION_SCREENSHOT:
{
break;
case SACTION_SCREENSHOT:
{