ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4294 from shuffle2/remove-osd-newlines 

Remove '\n' from OSD messages; they would be converted to '?'
This commit is contained in:
Mat M 2016-10-04 09:48:09 -04:00 committed by GitHub
parent ea33405feb 55af20a439
commit 9ecd25067b
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/DSP/DSPCore.cpp
View File

@ -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;

3
Source/Core/Core/Movie.cpp
View File

@ -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);
}

2
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -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)