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

This errors out in MSVC since the inclusion of winsock2.h, CL uses the
macro not the template version.
This commit is contained in:
Ahmed Samy
2013-11-13 23:48:10 +02:00
parent f02d5e7975
commit 28d967ccce
19 changed files with 58 additions and 58 deletions

View File

@@ -664,7 +664,7 @@ bool Game::dashWalk(Otc::Direction direction)
m_localPlayer->stopAutoWalk();
}
if(m_localPlayer->isWalking() && m_dashTimer.ticksElapsed() < std::max<int>(m_localPlayer->getStepDuration(false, direction) - m_ping, 30))
if(m_localPlayer->isWalking() && m_dashTimer.ticksElapsed() < max<int>(m_localPlayer->getStepDuration(false, direction) - m_ping, 30))
return false;
Position toPos = m_localPlayer->getPosition().translatedToDirection(direction);