X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmain.c;h=1318e1956d0a39ac3cbb7cad696b0ff5e7baf82d;hb=refs%2Fheads%2Flibretro;hp=eacbee9f274a90339788265a8b3aa2219cac4c7e;hpb=cdee2d818c421aad6b343faa0d0acb0b069f1741;p=pcsx_rearmed.git

diff --git a/frontend/main.c b/frontend/main.c
index eacbee9f..1318e195 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -31,7 +31,9 @@
 #include "arm_features.h"
 #include "revision.h"
 
-#if defined(__has_builtin)
+#if defined(__EMSCRIPTEN__)
+#define DO_CPU_CHECKS 0
+#elif defined(__has_builtin)
 #define DO_CPU_CHECKS __has_builtin(__builtin_cpu_init)
 #elif defined(__x86_64__) || defined(__i386__)
 #define DO_CPU_CHECKS 1
@@ -136,26 +138,22 @@ void emu_set_default_config(void)
 	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;
-#if 0
-	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;
-#else
+	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;
-#endif
-	pl_rearmed_cbs.gpu_unai.abe_hack =
-	pl_rearmed_cbs.gpu_unai.no_light =
-	pl_rearmed_cbs.gpu_unai.no_blend = 0;
+	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;
 	memset(&pl_rearmed_cbs.gpu_peopsgl, 0, sizeof(pl_rearmed_cbs.gpu_peopsgl));
 	pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
 	pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
@@ -293,6 +291,10 @@ do_state_slot:
 				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;
@@ -417,6 +419,8 @@ void emu_on_new_cd(int show_hud_msg)
 		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())
@@ -595,6 +599,7 @@ int main(int argc, char *argv[])
 {
 	char file[MAXPATHLEN] = "";
 	char path[MAXPATHLEN];
+	char isofilename[MAXPATHLEN];
 	const char *cdfile = NULL;
 	const char *loadst_f = NULL;
 	int psxout = 0;
@@ -613,8 +618,6 @@ int main(int argc, char *argv[])
 			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] != '/') {
@@ -815,7 +818,7 @@ void SysReset() {
 	// reset can run code, timing must be set
 	pl_timing_prepare(Config.PsxType);
 
-   // hmh core forgets this
+	// hmh core forgets this
 	CDR_stop();
    
 	EmuReset();
@@ -1104,7 +1107,7 @@ void *SysLoadSym(void *lib, const char *sym) {
 
 const char *SysLibError() {
 #if defined(NO_DYLIB)
-   return NULL;
+	return NULL;
 #elif !defined(_WIN32)
 	return dlerror();
 #else