X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmain.c;h=cec1fbbf3cb0c9d8c5e1d6452d92855dd64a4215;hb=9159f799aba897c27569a7a51a40736bd8a90d2f;hp=e1141d6b5b259a75de6624525e2111445c624d09;hpb=ead6fd751369f6fe50cb5092ab5530fbf1d66b67;p=pcsx_rearmed.git

diff --git a/frontend/main.c b/frontend/main.c
index e1141d6b..cec1fbbf 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -24,6 +24,7 @@
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/sio.h"
+#include "../libpcsxcore/database.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 #include "../plugins/dfsound/spu_config.h"
@@ -141,20 +142,15 @@ void emu_set_default_config(void)
 	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;
@@ -418,7 +414,11 @@ void emu_on_new_cd(int show_hud_msg)
 	}
 
 	if (show_hud_msg) {
-		snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG);
+		if (check_unsatisfied_libcrypt())
+			snprintf(hud_msg, sizeof(hud_msg),
+				"LibCrypt protected game with missing SBI detected");
+		else
+			snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG);
 		hud_new_msg = 3;
 	}
 }
@@ -715,6 +715,8 @@ int main(int argc, char *argv[])
 	}
 
 	if (ready_to_go) {
+		if (menu_load_config(1) != 0)
+			menu_load_config(0);
 		menu_prepare_emu();
 
 		// If a state has been specified, then load that
@@ -808,7 +810,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();
@@ -1097,7 +1099,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