spunull: Add missing callback and fix prototypes

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index 45e2581..6df1731 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -136,18 +136,19 @@ void emu_set_default_config(void)
        Config.PsxAuto = 1;
        Config.cycle_multiplier = CYCLE_MULT_DEFAULT;
        Config.GpuListWalking = -1;
        Config.PsxAuto = 1;
        Config.cycle_multiplier = CYCLE_MULT_DEFAULT;
        Config.GpuListWalking = -1;

+       Config.FractionalFramerate = -1;

 
        pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto
        pl_rearmed_cbs.gpu_neon.enhancement_enable =
        pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0;
        pl_rearmed_cbs.gpu_peops.iUseDither = 0;
        pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7;
 
        pl_rearmed_cbs.gpu_neon.allow_interlace = 2; // auto
        pl_rearmed_cbs.gpu_neon.enhancement_enable =
        pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0;
        pl_rearmed_cbs.gpu_peops.iUseDither = 0;
        pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7;

-       pl_rearmed_cbs.gpu_senquack.ilace_force = 0;
-       pl_rearmed_cbs.gpu_senquack.pixel_skip = 0;
-       pl_rearmed_cbs.gpu_senquack.lighting = 1;
-       pl_rearmed_cbs.gpu_senquack.fast_lighting = 0;
-       pl_rearmed_cbs.gpu_senquack.blending = 1;
-       pl_rearmed_cbs.gpu_senquack.dithering = 0;
+       pl_rearmed_cbs.gpu_unai.ilace_force = 0;
+       pl_rearmed_cbs.gpu_unai.pixel_skip = 0;
+       pl_rearmed_cbs.gpu_unai.lighting = 1;
+       pl_rearmed_cbs.gpu_unai.fast_lighting = 0;
+       pl_rearmed_cbs.gpu_unai.blending = 1;
+       pl_rearmed_cbs.gpu_unai.dithering = 0;

        pl_rearmed_cbs.gpu_unai_old.abe_hack =
        pl_rearmed_cbs.gpu_unai_old.no_light =
        pl_rearmed_cbs.gpu_unai_old.no_blend = 0;
        pl_rearmed_cbs.gpu_unai_old.abe_hack =
        pl_rearmed_cbs.gpu_unai_old.no_light =
        pl_rearmed_cbs.gpu_unai_old.no_blend = 0;


@@ -288,6 +289,10 @@ do_state_slot:
                                SysMessage("GPU_open returned %d", ret);
                }
                return;
                                SysMessage("GPU_open returned %d", ret);
                }
                return;

+       case SACTION_ANALOG_TOGGLE:
+               ret = padToggleAnalog(0);
+               snprintf(hud_msg, sizeof(hud_msg), "ANALOG %s", ret ? "ON" : "OFF");
+               break;

 #endif
        default:
                return;
 #endif
        default:
                return;


@@ -412,6 +417,8 @@ void emu_on_new_cd(int show_hud_msg)
                SysPrintf("note: running with HLE BIOS, expect compatibility problems\n");
                SysPrintf("----------------------------------------------------------\n");
        }
                SysPrintf("note: running with HLE BIOS, expect compatibility problems\n");
                SysPrintf("----------------------------------------------------------\n");
        }

+       if (Config.TurboCD)
+               SysPrintf("note: TurboCD is enabled, this breaks games\n");

 
        if (show_hud_msg) {
                if (check_unsatisfied_libcrypt())
 
        if (show_hud_msg) {
                if (check_unsatisfied_libcrypt())


@@ -590,6 +597,7 @@ int main(int argc, char *argv[])
 {
        char file[MAXPATHLEN] = "";
        char path[MAXPATHLEN];
 {
        char file[MAXPATHLEN] = "";
        char path[MAXPATHLEN];

+       char isofilename[MAXPATHLEN];

        const char *cdfile = NULL;
        const char *loadst_f = NULL;
        int psxout = 0;
        const char *cdfile = NULL;
        const char *loadst_f = NULL;
        int psxout = 0;


@@ -608,8 +616,6 @@ int main(int argc, char *argv[])
                        SysPrintf("Using config file %s.\n", cfgfile_basename);
                }
                else if (!strcmp(argv[i], "-cdfile")) {
                        SysPrintf("Using config file %s.\n", cfgfile_basename);
                }
                else if (!strcmp(argv[i], "-cdfile")) {

-                       char isofilename[MAXPATHLEN];
-

                        if (i+1 >= argc) break;
                        strncpy(isofilename, argv[++i], MAXPATHLEN);
                        if (isofilename[0] != '/') {
                        if (i+1 >= argc) break;
                        strncpy(isofilename, argv[++i], MAXPATHLEN);
                        if (isofilename[0] != '/') {