rename gpu_unai to gpu_unai_old

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index 34f68d4..45e2581 100644 (file)
--- 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"
@@ -147,9 +148,9 @@ void emu_set_default_config(void)
        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.abe_hack =
-       pl_rearmed_cbs.gpu_unai.no_light =
-       pl_rearmed_cbs.gpu_unai.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;
        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;
@@ -413,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;
        }
 }
@@ -710,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