From 959797dbcff19bea14f59b6e2cc74378fcd03f52 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Tue, 7 May 2013 19:59:17 +0000 Subject: Replaced MIN / MAX with std::min and std::max git-svn-id: http://mc-server.googlecode.com/svn/trunk@1455 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/CraftingRecipes.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/CraftingRecipes.cpp') diff --git a/source/CraftingRecipes.cpp b/source/CraftingRecipes.cpp index b47db7e5b..13a8ac1e0 100644 --- a/source/CraftingRecipes.cpp +++ b/source/CraftingRecipes.cpp @@ -583,10 +583,10 @@ cCraftingRecipes::cRecipe * cCraftingRecipes::FindRecipe(const cItem * a_Craftin { if (!a_CraftingGrid[x + y * a_GridWidth].IsEmpty()) { - GridRight = MAX(x, GridRight); - GridBottom = MAX(y, GridBottom); - GridLeft = MIN(x, GridLeft); - GridTop = MIN(y, GridTop); + GridRight = std::max(x, GridRight); + GridBottom = std::max(y, GridBottom); + GridLeft = std::min(x, GridLeft); + GridTop = std::min(y, GridTop); } } int GridWidth = GridRight - GridLeft + 1; -- cgit v1.2.3