From 3dac5df814679df7937b6c0b4781950b54dc9fdb Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 15 Jan 2011 00:29:25 +0000 Subject: [PATCH] - wacky vc++ compile bugfix, code was changed in other header files and now std::max fails! --- source/glest_game/world/unit_updater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/glest_game/world/unit_updater.cpp b/source/glest_game/world/unit_updater.cpp index c17831927..09676f9d3 100644 --- a/source/glest_game/world/unit_updater.cpp +++ b/source/glest_game/world/unit_updater.cpp @@ -1516,7 +1516,7 @@ void UnitUpdater::updateMorph(Unit *unit){ break; case pfRoutePlanner: if (needMapUpdate) { - int size = std::max(oldSize, unit->getType()->getSize()); + int size = max(oldSize, unit->getType()->getSize()); world->getCartographer()->updateMapMetrics(unit->getPos(), size); } break;