flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Replaced MIN / MAX with std::min and std::max

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1455 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-05-07 19:59:17 +00:00
parent 8aa88e7815
commit 959797dbcf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/CraftingRecipes.cpp
View File

@ -583,10 +583,10 @@ cCraftingRecipes::cRecipe * cCraftingRecipes::FindRecipe(const cItem * a_Craftin
{ {
if (!a_CraftingGrid[x + y * a_GridWidth].IsEmpty()) if (!a_CraftingGrid[x + y * a_GridWidth].IsEmpty())
{ {
GridRight = MAX(x, GridRight); GridRight = std::max(x, GridRight);
GridBottom = MAX(y, GridBottom); GridBottom = std::max(y, GridBottom);
GridLeft = MIN(x, GridLeft); GridLeft = std::min(x, GridLeft);
GridTop = MIN(y, GridTop); GridTop = std::min(y, GridTop);
} }
} }
int GridWidth = GridRight - GridLeft + 1; int GridWidth = GridRight - GridLeft + 1;

2
source/LightingThread.cpp
View File

@ -398,7 +398,7 @@ void cLightingThread::PrepareSkyLight(void)
int Neighbor2 = m_HeightMap[idx - 1] + 1; // X - 1 int Neighbor2 = m_HeightMap[idx - 1] + 1; // X - 1
int Neighbor3 = m_HeightMap[idx + cChunkDef::Width * 3] + 1; // Z + 1 int Neighbor3 = m_HeightMap[idx + cChunkDef::Width * 3] + 1; // Z + 1
int Neighbor4 = 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: // 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) for (int y = cChunkDef::Height - 1, Index = idx + y * BlocksPerYLayer; y >= Current; y--, Index -= BlocksPerYLayer)