From 1cc18760026c1bc9d5192265f3ace634978f6bfc Mon Sep 17 00:00:00 2001 From: degasus Date: Sat, 15 Oct 2016 12:36:11 +0200 Subject: Revert "Merge pull request #4286 from shuffle2/Aestek-clean-osd" This reverts commit 5c0fa4db4fa4a2533c190825e83675f074eaf50c, reversing changes made to b8731eb8180d76b4663eaf4188f985b9c5fa6fb2. --- Source/Core/VideoCommon/OnScreenDisplay.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'Source/Core/VideoCommon/OnScreenDisplay.cpp') diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index d0f6f24825..62997cd150 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -21,24 +21,18 @@ static std::multimap s_callbacks; static std::multimap s_messages; static std::mutex s_messages_mutex; -static std::string CleanMessage(std::string message) -{ - std::replace_if(message.begin(), message.end(), [](char c) { return !std::isprint(c); }, '?'); - return message; -} - void AddTypedMessage(MessageType type, const std::string& message, u32 ms, u32 rgba) { std::lock_guard lock(s_messages_mutex); s_messages.erase(type); - s_messages.emplace(type, Message(CleanMessage(message), Common::Timer::GetTimeMs() + ms, rgba)); + s_messages.emplace(type, Message(message, Common::Timer::GetTimeMs() + ms, rgba)); } void AddMessage(const std::string& message, u32 ms, u32 rgba) { std::lock_guard lock(s_messages_mutex); s_messages.emplace(MessageType::Typeless, - Message(CleanMessage(message), Common::Timer::GetTimeMs() + ms, rgba)); + Message(message, Common::Timer::GetTimeMs() + ms, rgba)); } void DrawMessage(const Message& msg, int top, int left, int time_left) @@ -58,7 +52,7 @@ void DrawMessages() std::lock_guard lock(s_messages_mutex); u32 now = Common::Timer::GetTimeMs(); - int left = 20, top = 20; + int left = 20, top = 35; auto it = s_messages.begin(); while (it != s_messages.end()) -- cgit v1.2.3