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

@@ -101,8 +101,8 @@ void Tile::draw(const Point& dest, float scaleFactor, int drawFlags, LightView *
thing->draw(dest - m_drawElevation*scaleFactor, scaleFactor, animate, lightView);
if(thing->isLyingCorpse()) {
redrawPreviousTopW = std::max(thing->getWidth(), redrawPreviousTopW);
redrawPreviousTopH = std::max(thing->getHeight(), redrawPreviousTopH);
redrawPreviousTopW = max(thing->getWidth(), redrawPreviousTopW);
redrawPreviousTopH = max(thing->getHeight(), redrawPreviousTopH);
}
m_drawElevation += thing->getElevation();