summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-07 21:59:17 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-07 21:59:17 +0200
commit959797dbcff19bea14f59b6e2cc74378fcd03f52 (patch)
tree7c566805b22e0d1c0a3841a7ec297522bccd1ad7
parentProtocol132: Replaced magic numbers with symbolic packet names (diff)
downloadcuberite-959797dbcff19bea14f59b6e2cc74378fcd03f52.tar
cuberite-959797dbcff19bea14f59b6e2cc74378fcd03f52.tar.gz
cuberite-959797dbcff19bea14f59b6e2cc74378fcd03f52.tar.bz2
cuberite-959797dbcff19bea14f59b6e2cc74378fcd03f52.tar.lz
cuberite-959797dbcff19bea14f59b6e2cc74378fcd03f52.tar.xz
cuberite-959797dbcff19bea14f59b6e2cc74378fcd03f52.tar.zst
cuberite-959797dbcff19bea14f59b6e2cc74378fcd03f52.zip
-rw-r--r--source/CraftingRecipes.cpp8
-rw-r--r--source/LightingThread.cpp2
2 files changed, 5 insertions, 5 deletions
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;
diff --git a/source/LightingThread.cpp b/source/LightingThread.cpp
index 5c39f731b..258fd7dd4 100644
--- a/source/LightingThread.cpp
+++ b/source/LightingThread.cpp
@@ -398,7 +398,7 @@ void cLightingThread::PrepareSkyLight(void)
int Neighbor2 = m_HeightMap[idx - 1] + 1; // X - 1
int Neighbor3 = m_HeightMap[idx + cChunkDef::Width * 3] + 1; // Z + 1
int Neighbor4 = m_HeightMap[idx - cChunkDef::Width * 3] + 1; // Z - 1
- int MaxNeighbor = MAX(MAX(Neighbor1, Neighbor2), MAX(Neighbor3, Neighbor4)); // Maximum of the four neighbors
+ int MaxNeighbor = std::max(std::max(Neighbor1, Neighbor2), std::max(Neighbor3, Neighbor4)); // Maximum of the four neighbors
// Fill the column from the top down to Current with all-light:
for (int y = cChunkDef::Height - 1, Index = idx + y * BlocksPerYLayer; y >= Current; y--, Index -= BlocksPerYLayer)