From 84e970e14f0e0ce9dd93ba0f2cb0d2a0d9dde218 Mon Sep 17 00:00:00 2001 From: R2DLiu Date: Mon, 13 Jul 2020 22:35:38 -0400 Subject: [PATCH] draw controls during replay --- Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp | 11 ++--------- Source/Core/VideoCommon/RenderBase.cpp | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp index 3e0d0f6317..d9e6ec9ae1 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp @@ -28,16 +28,8 @@ #include "Core/NetPlayClient.h" #include "Core/Slippi/SlippiReplayComm.h" #include "Core/Slippi/SlippiPlayback.h" - - #include "Core/State.h" - -// Not clean but idk a better way atm -//#ifndef LINUX_LOCAL_DEV -//#include "DolphinWX/Frame.h" -//#include "DolphinWX/Main.h" -//#endif - +#include "VideoCommon/OnScreenDisplay.h" #define FRAME_INTERVAL 900 #define SLEEP_TIME_MS 8 @@ -723,6 +715,7 @@ void CEXISlippi::prepareGameInfo(u8* payload) if (replayCommSettings.rollbackDisplayMethod == "off" && (replayCommSettings.mode == "normal" || replayCommSettings.mode == "queue")) { + OSD::DrawSlippiPlaybackControls(); g_playbackStatus->startThreads(); } } diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index dc51872679..b000f2f777 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -1255,7 +1255,6 @@ void Renderer::Swap(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height, u6 DrawDebugText(); OSD::DrawMessages(); - OSD::DrawSlippiPlaybackControls(); ImGui::Render(); }