mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Revert "Merge pull request #4286 from shuffle2/Aestek-clean-osd"
This reverts commit5c0fa4db4f
, reversing changes made tob8731eb818
.
This commit is contained in:
@ -21,24 +21,18 @@ static std::multimap<CallbackType, Callback> s_callbacks;
|
||||
static std::multimap<MessageType, Message> 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<std::mutex> 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<std::mutex> 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<std::mutex> 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())
|
||||
|
Reference in New Issue
Block a user