diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2016-10-04 03:52:13 -0700 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2016-10-04 03:52:13 -0700 |
| commit | 55af20a439e062cd8919ff1db41bdcd8a3bc8c05 (patch) | |
| tree | 48e424a001c906e80467f846dca875ebad23f7c4 /Source/Core | |
| parent | ea33405febf183058bb30a22f4f627fed4bb8e17 (diff) | |
Remove '\n' from OSD messages; they would be converted to '?'
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/DSP/DSPCore.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/Movie.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/Source/Core/Core/DSP/DSPCore.cpp b/Source/Core/Core/DSP/DSPCore.cpp index 7c6a3beb52..428cd09fd3 100644 --- a/Source/Core/Core/DSP/DSPCore.cpp +++ b/Source/Core/Core/DSP/DSPCore.cpp @@ -82,7 +82,7 @@ static bool VerifyRoms() { DSPHost::OSD_AddMessage("You are using a free DSP ROM made by the Dolphin Team.", 8000); DSPHost::OSD_AddMessage("All Wii games will work correctly, and most GC games should ", 8000); - DSPHost::OSD_AddMessage("also work fine, but the GBA/IPL/CARD UCodes will not work.\n", 8000); + DSPHost::OSD_AddMessage("also work fine, but the GBA/IPL/CARD UCodes will not work.", 8000); } return true; diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 68ee999952..c77bee78a7 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -735,7 +735,6 @@ static void SetInputDisplayString(ControllerState padState, int controllerID) display_str += Analog1DToString(padState.TriggerR, " R"); display_str += Analog2DToString(padState.AnalogStickX, padState.AnalogStickY, " ANA"); display_str += Analog2DToString(padState.CStickX, padState.CStickY, " C"); - display_str += '\n'; std::lock_guard<std::mutex> guard(s_input_display_lock); s_InputDisplay[controllerID] = std::move(display_str); @@ -859,8 +858,6 @@ static void SetWiiInputDisplayString(int remoteID, u8* const data, display_str += Analog2DToString(cc.rx1 | (cc.rx2 << 1) | (cc.rx3 << 3), cc.ry, " R-ANA", 31); } - display_str += '\n'; - std::lock_guard<std::mutex> guard(s_input_display_lock); s_InputDisplay[controllerID] = std::move(display_str); } diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index af04ba1ed4..60375a43db 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -326,7 +326,7 @@ void Renderer::DrawDebugText() if (SConfig::GetInstance().m_ShowLag) { draw_text(OSD::MessageType::MovieLag, - StringFromFormat("Lag: %" PRIu64 "\n", Movie::GetCurrentLagCount())); + StringFromFormat("Lag: %" PRIu64, Movie::GetCurrentLagCount())); } if (SConfig::GetInstance().m_ShowInputDisplay) |