From 811d8781ab152879a6d27ab9a4ad7e07ce443747 Mon Sep 17 00:00:00 2001 From: lightningterror Date: Fri, 1 Mar 2019 11:11:57 +0100 Subject: [PATCH] cdvd: Get rid of code that disabled loading psx discs. Not used anymore. --- pcsx2/CDVD/CDVD.cpp | 9 --------- pcsx2/Config.h | 6 ------ 2 files changed, 15 deletions(-) diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp index daa5475a2d..fe1e5ba386 100644 --- a/pcsx2/CDVD/CDVD.cpp +++ b/pcsx2/CDVD/CDVD.cpp @@ -398,15 +398,6 @@ void cdvdReloadElfInfo(wxString elfoverride) if(discType==1) { - // Is a PS1 disc. - if (!ENABLE_LOADING_PS1_GAMES) - Cpu->ThrowException( Exception::RuntimeError() - .SetDiagMsg(L"PSX game discs are not supported by PCSX2.") - .SetUserMsg(pxE( L"Playstation game discs are not supported by PCSX2. If you want to emulate PSX games then you'll have to download a PSX-specific emulator, such as ePSXe or PCSX.") - ) - ); - //Console.Error( "Playstation1 game discs are not supported by PCSX2." ); - // PCSX2 currently only recognizes *.elf executables in proper PS2 format. // To support different PSX titles in the console title and for savestates, this code bypasses all the detection, // simply using the exe name, stripped of problematic characters. diff --git a/pcsx2/Config.h b/pcsx2/Config.h index a85fb05235..3c5904fdf5 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -586,12 +586,6 @@ TraceLogFilters& SetTraceConfig(); #define EE_CONST_PROP 1 // rec2 - enables constant propagation (faster) -// Change to 1 if working on getting PS1 emulation working. -// This disables the exception normally caused by trying to load PS1 -// games. Note: currently PS1 games will error out even without this -// commented, so this is for development purposes only. -#define ENABLE_LOADING_PS1_GAMES 1 - // Change to 1 for console logs of SIF, GPU (PS1 mode) and MDEC (PS1 mode). // These do spam a lot though! #define PSX_EXTRALOGS 0