Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-20 06:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "replace all std::min/std::max with just min/max"

Browse Source 
This reverts commit 28d967ccce.
This commit is contained in:
Ahmed Samy
2013-11-13 23:53:54 +02:00
parent 28d967ccce
commit 1711d8bdaf
19 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/statictext.cpp
View File

@@ -78,7 +78,7 @@ bool StaticText::addMessage(const std::string& name, Otc::MessageMode mode, cons
m_updateEvent = nullptr;
}
int delay = max<int>(Otc::STATIC_DURATION_PER_CHARACTER * text.length(), Otc::MIN_STATIC_TEXT_DURATION);
int delay = std::max<int>(Otc::STATIC_DURATION_PER_CHARACTER * text.length(), Otc::MIN_STATIC_TEXT_DURATION);
if(isYell())
delay *= 2;
@@ -106,7 +106,7 @@ void StaticText::update()
void StaticText::scheduleUpdate()
{
int delay = max<int>(m_messages.front().second - g_clock.millis(), 0);
int delay = std::max<int>(m_messages.front().second - g_clock.millis(), 0);
auto self = asStaticText();
m_updateEvent = g_dispatcher.scheduleEvent([self]() {