X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=498e78062123f017af9f95d60293c72a054f712b;hp=13be9acc514e87adad71598b5419732bafb5974e;hb=ffdbda296db49dabfba11d2e87f18dcaa759353d;hpb=51f77282d6cb4bc06248395cc1e712ee298910af

diff --git a/frontend/main.c b/frontend/main.c
index 13be9acc..498e7806 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -149,8 +149,6 @@ void do_emu_action(void)
 	emu_action_old = emu_action;
 
 	switch (emu_action) {
-	case SACTION_NONE:
-		return;
 	case SACTION_ENTER_MENU:
 		menu_loop();
 		return;
@@ -173,9 +171,14 @@ void do_emu_action(void)
 			state_slot = 9;
 		goto do_state_slot;
 	case SACTION_TOGGLE_FSKIP:
-		pl_rearmed_cbs.frameskip ^= 1;
-		snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP %s",
-			pl_rearmed_cbs.frameskip ? "ON" : "OFF");
+		pl_rearmed_cbs.fskip_advice = 0;
+		pl_rearmed_cbs.frameskip++;
+		if (pl_rearmed_cbs.frameskip > 1)
+			pl_rearmed_cbs.frameskip = -1;
+		snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP: %s",
+			pl_rearmed_cbs.frameskip == -1 ? "AUTO" :
+			pl_rearmed_cbs.frameskip == 0 ? "OFF" : "1" );
+		plugin_call_rearmed_cbs();
 		break;
 	case SACTION_SCREENSHOT:
 		{
@@ -196,6 +199,8 @@ void do_emu_action(void)
 				snprintf(hud_msg, sizeof(hud_msg), "SCREENSHOT TAKEN");
 			break;
 		}
+	default:
+		return;
 	}
 	hud_new_msg = 3;
 	return;
@@ -204,6 +209,7 @@ do_state_slot:
 	snprintf(hud_msg, sizeof(hud_msg), "STATE SLOT %d [%s]", state_slot,
 		emu_check_state(state_slot) == 0 ? "USED" : "FREE");
 	hud_new_msg = 3;
+	printf("* %s\n", hud_msg);
 }
 
 int main(int argc, char *argv[])
@@ -317,6 +323,7 @@ int main(int argc, char *argv[])
 	//in_probe();
 	plat_init();
 	menu_init(); // loads config
+	pl_init();
 
 	if (psxout)
 		Config.PsxOut = 1;
@@ -476,7 +483,9 @@ int emu_save_state(int slot)
 	if (ret != 0)
 		return ret;
 
-	return SaveState(fname);
+	ret = SaveState(fname);
+	printf("* %s \"%s\" [%d]\n", ret == 0 ? "saved" : "failed to save", fname, slot);
+	return ret;
 }
 
 int emu_load_state(int slot)