From b6203c66c20e83b9f254bf58cadaeab235a51ecc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 2 Jun 2018 14:08:01 -0400 Subject: [PATCH] EXI_DeviceIPL: In-class initialize data members where applicable --- Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp | 5 +---- Source/Core/Core/HW/EXI/EXI_DeviceIPL.h | 10 +++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp index 08af03a6da..db2f64afb4 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp @@ -95,7 +95,7 @@ void CEXIIPL::Descrambler(u8* data, u32 size) } } -CEXIIPL::CEXIIPL() : m_uPosition(0), m_uAddress(0), m_uRWOffset(0), m_FontsLoaded(false) +CEXIIPL::CEXIIPL() { // Create the IPL m_pIPL = static_cast(Common::AllocateMemoryPages(ROM_SIZE)); @@ -123,9 +123,6 @@ CEXIIPL::CEXIIPL() : m_uPosition(0), m_uAddress(0), m_uRWOffset(0), m_FontsLoade LoadFontFile((File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + FONT_WINDOWS_1252), 0x1fcf00); } - // Clear RTC - memset(m_RTC, 0, sizeof(m_RTC)); - // We Overwrite language selection here since it's possible on the GC to change the language as // you please g_SRAM.lang = SConfig::GetInstance().SelectedLanguage; diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.h b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.h index d1c7404f8e..f271739ee4 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.h +++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.h @@ -56,15 +56,15 @@ private: // STATE_TO_SAVE //! RealTimeClock - u8 m_RTC[4]; + u8 m_RTC[4] = {}; //! Helper - u32 m_uPosition; - u32 m_uAddress; - u32 m_uRWOffset; + u32 m_uPosition = 0; + u32 m_uAddress = 0; + u32 m_uRWOffset = 0; std::string m_buffer; - bool m_FontsLoaded; + bool m_FontsLoaded = false; void UpdateRTC();