diff options
| author | Twinaphex | 2019-03-07 13:49:46 +0100 |
|---|---|---|
| committer | GitHub | 2019-03-07 13:49:46 +0100 |
| commit | 2a8fedf7715b816d95467fe261edd3c8372bd34b (patch) | |
| tree | 0dfb1ce4a0e2e12998bff3c485976b7db83132ac /libpcsxcore | |
| parent | 3733c6fefd2bcc15a637139c036518762aa5956b (diff) | |
| parent | b8d1fb0981058cc8dba7ab45d90f480663bf1ab4 (diff) | |
| download | pcsx_rearmed-2a8fedf7715b816d95467fe261edd3c8372bd34b.tar.gz pcsx_rearmed-2a8fedf7715b816d95467fe261edd3c8372bd34b.tar.bz2 pcsx_rearmed-2a8fedf7715b816d95467fe261edd3c8372bd34b.zip | |
Merge pull request #235 from retro-wertz/core_fixes
Core fixes
Diffstat (limited to 'libpcsxcore')
| -rw-r--r-- | libpcsxcore/misc.c | 2 | ||||
| -rw-r--r-- | libpcsxcore/psxcommon.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c index 58170cf..bb34e5b 100644 --- a/libpcsxcore/misc.c +++ b/libpcsxcore/misc.c @@ -180,7 +180,7 @@ int LoadCdrom() { // is just below, do it here fake_bios_gpu_setup(); - if (!Config.HLE) { + if (!Config.HLE && !Config.SlowBoot) { // skip BIOS logos psxRegs.pc = psxRegs.GPR.n.ra; return 0; diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h index 9f5444e..a7dd6ae 100644 --- a/libpcsxcore/psxcommon.h +++ b/libpcsxcore/psxcommon.h @@ -119,6 +119,7 @@ typedef struct { boolean PsxAuto; boolean Cdda; boolean HLE; + boolean SlowBoot; boolean Debug; boolean PsxOut; boolean SpuIrq; |