From 191f50d74ae7d9147ed6f4b7ade5cf6e5c20a50f Mon Sep 17 00:00:00 2001 From: ouni666 <119520413+ouni666@users.noreply.github.com> Date: Sat, 22 Mar 2025 13:12:38 +0800 Subject: [PATCH] Update GBACore.cpp Update #ifdef statements to accurately identify legacy/new code segments. --- Source/Core/Core/HW/GBACore.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/HW/GBACore.cpp b/Source/Core/Core/HW/GBACore.cpp index cf91129373..ed47a6c6d7 100644 --- a/Source/Core/Core/HW/GBACore.cpp +++ b/Source/Core/Core/HW/GBACore.cpp @@ -306,7 +306,11 @@ CoreInfo Core::GetCoreInfo() const info.has_rom = !m_rom_path.empty(); info.has_ereader = info.is_gba && static_cast<::GBA*>(m_core->board)->memory.hw.devices & HW_EREADER; - m_core->desiredVideoDimensions(m_core, &info.width, &info.height); + #ifdef NEW_MGBA_VERSION + m_core->currentVideoSize(m_core, &info.width, &info.height); + #else + m_core->desiredVideoDimensions(m_core, &info.width, &info.height); + #endif info.game_title = m_game_title; return info; } @@ -390,14 +394,18 @@ void Core::SetSIODriver() }; } -void Core::SetVideoBuffer() -{ +void Core::SetVideoBuffer() { u32 width, height; - m_core->desiredVideoDimensions(m_core, &width, &height); - m_video_buffer.resize(width * height); - m_core->setVideoBuffer(m_core, m_video_buffer.data(), width); - if (auto host = m_host.lock()) + #ifdef NEW_MGBA_VERSION + m_core->currentVideoSize(m_core, &width, &height); + #else + m_core->desiredVideoDimensions(m_core, &width, &height); + #endif + m_video_buffer.resize(width * height); + m_core->setVideoBuffer(m_core, m_video_buffer.data(), width); + if (auto host = m_host.lock()) { host->GameChanged(); + } } void Core::SetSampleRates()