#include "../libpcsxcore/cdriso.h"
#include "../libpcsxcore/cheat.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
-#include "../plugins/dfinput/externals.h"
#include "../plugins/dfsound/spu_config.h"
#include "psemu_plugin_defs.h"
#include "arm_features.h"
} menu_id;
static int last_vout_w, last_vout_h, last_vout_bpp;
-static int cpu_clock, cpu_clock_st, volume_boost, frameskip;
+static int cpu_clock, cpu_clock_st, volume_boost;
+static int frameskip = 1; // 0 - auto, 1 - off
static char last_selected_fname[MAXPATHLEN];
static int config_save_counter, region, in_type_sel1, in_type_sel2;
static int psx_clock;
#define DEFAULT_PSX_CLOCK_S "50"
#endif
-static const char *bioses[24];
+static const char *bioses[32];
static const char *gpu_plugins[16];
static const char *spu_plugins[16];
static const char *memcards[32];
switch (in_type_sel1) {
case 1: in_type[0] = PSE_PAD_TYPE_ANALOGPAD; break;
case 2: in_type[0] = PSE_PAD_TYPE_NEGCON; break;
+ case 3: in_type[0] = PSE_PAD_TYPE_NONE; break;
default: in_type[0] = PSE_PAD_TYPE_STANDARD;
}
switch (in_type_sel2) {
case 1: in_type[1] = PSE_PAD_TYPE_ANALOGPAD; break;
case 2: in_type[1] = PSE_PAD_TYPE_NEGCON; break;
+ case 3: in_type[1] = PSE_PAD_TYPE_NONE; break;
default: in_type[1] = PSE_PAD_TYPE_STANDARD;
}
if (in_evdev_allow_abs_only != allow_abs_only_old) {
g_scaler = SCALE_4_3;
g_gamma = 100;
volume_boost = 0;
- frameskip = 0;
+ frameskip = 1; // 1 - off
analog_deadzone = 50;
soft_scaling = 1;
soft_filter = 0;
CE_INTVAL(g_autostateld_opt),
CE_INTVAL_N("adev0_is_nublike", in_adev_is_nublike[0]),
CE_INTVAL_N("adev1_is_nublike", in_adev_is_nublike[1]),
- CE_INTVAL_V(frameskip, 3),
+ CE_INTVAL_V(frameskip, 4),
CE_INTVAL_P(gpu_peops.iUseDither),
CE_INTVAL_P(gpu_peops.dwActFixes),
CE_INTVAL_P(gpu_unai.lineskip),
static void keys_load_all(const char *cfg);
-static int menu_load_config(int is_game)
+int menu_load_config(int is_game)
{
char cfgfile[MAXPATHLEN];
int i, ret = -1;
"Standard (SCPH-1080)",
"Analog (SCPH-1150)",
"GunCon",
+ "None",
NULL
};
static const char h_nub_btns[] = "Experimental, keep this OFF if unsure. Select rescan after change.";
continue;
snprintf(fname, sizeof(fname), "%s/%s", Config.BiosDir, ent->d_name);
- if (stat(fname, &st) != 0 || st.st_size != 512*1024) {
+ if (stat(fname, &st) != 0
+ || (st.st_size != 512*1024 && st.st_size != 4*1024*1024)) {
printf("bad BIOS file: %s\n", ent->d_name);
continue;
}
if (ret)
fprintf(stderr, "Warning: GPU_open returned %d\n", ret);
}
-
- dfinput_activate();
}
void menu_update_msg(const char *msg)