From ec969da6bdd8abaa2e43a5a8c1cc7e589997219a Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 23 Dec 2016 22:05:14 +0100 Subject: [PATCH] EXI_DeviceIPL: Remove m_bNTSC It's only used in the constructor. --- Source/Core/Core/HW/EXI_DeviceIPL.cpp | 9 ++++----- Source/Core/Core/HW/EXI_DeviceIPL.h | 3 --- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI_DeviceIPL.cpp index ae89d42158..5b2287ace4 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI_DeviceIPL.cpp @@ -91,17 +91,16 @@ void CEXIIPL::Descrambler(u8* data, u32 size) CEXIIPL::CEXIIPL() : m_uPosition(0), m_uAddress(0), m_uRWOffset(0), m_FontsLoaded(false) { - // Determine region - m_bNTSC = DiscIO::IsNTSC(SConfig::GetInstance().m_region); - // Create the IPL m_pIPL = static_cast(Common::AllocateMemoryPages(ROM_SIZE)); if (SConfig::GetInstance().bHLE_BS2) { // Copy header - memcpy(m_pIPL, m_bNTSC ? iplverNTSC : iplverPAL, - m_bNTSC ? sizeof(iplverNTSC) : sizeof(iplverPAL)); + if (DiscIO::IsNTSC(SConfig::GetInstance().m_region)) + memcpy(m_pIPL, iplverNTSC, sizeof(iplverNTSC)); + else + memcpy(m_pIPL, iplverPAL, sizeof(iplverPAL)); // Load fonts LoadFontFile((File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + FONT_SHIFT_JIS), 0x1aff00); diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.h b/Source/Core/Core/HW/EXI_DeviceIPL.h index e43fb4efdd..190ea63422 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.h +++ b/Source/Core/Core/HW/EXI_DeviceIPL.h @@ -52,9 +52,6 @@ private: REGION_EUART = 0x300001 }; - // Region - bool m_bNTSC; - //! IPL u8* m_pIPL;