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

Fixed unbraced ifs

This commit is contained in:
Tycho 2014-04-28 11:00:43 -07:00
parent 05fe6d6c58
commit 6d520e398b
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/BlockArea.cpp
View File

@ -66,7 +66,10 @@ template<bool MetaValid>
static void MergeCombinatorOverwrite(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta) static void MergeCombinatorOverwrite(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta)
{ {
a_DstType = a_SrcType; a_DstType = a_SrcType;
if (MetaValid) a_DstMeta = a_SrcMeta; if (MetaValid)
{
a_DstMeta = a_SrcMeta;
}
} }
@ -80,7 +83,10 @@ static void MergeCombinatorFillAir(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, N
if (a_DstType == E_BLOCK_AIR) if (a_DstType == E_BLOCK_AIR)
{ {
a_DstType = a_SrcType; a_DstType = a_SrcType;
if (MetaValid) a_DstMeta = a_SrcMeta; if (MetaValid)
{
a_DstMeta = a_SrcMeta;
}
} }
// "else" is the default, already in place // "else" is the default, already in place
} }
@ -96,7 +102,10 @@ static void MergeCombinatorImprint(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, N
if (a_SrcType != E_BLOCK_AIR) if (a_SrcType != E_BLOCK_AIR)
{ {
a_DstType = a_SrcType; a_DstType = a_SrcType;
if (MetaValid) a_DstMeta = a_SrcMeta; if (MetaValid)
{
a_DstMeta = a_SrcMeta;
}
} }
// "else" is the default, already in place // "else" is the default, already in place
} }
@ -119,7 +128,10 @@ static void MergeCombinatorLake(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBB
if (a_SrcType == E_BLOCK_AIR) if (a_SrcType == E_BLOCK_AIR)
{ {
a_DstType = E_BLOCK_AIR; a_DstType = E_BLOCK_AIR;
if (MetaValid) a_DstMeta = 0; if (MetaValid)
{
a_DstMeta = 0;
}
return; return;
} }
@ -144,7 +156,10 @@ static void MergeCombinatorLake(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBB
case E_BLOCK_STATIONARY_LAVA: case E_BLOCK_STATIONARY_LAVA:
{ {
a_DstType = a_SrcType; a_DstType = a_SrcType;
if (MetaValid) a_DstMeta = a_SrcMeta; if (MetaValid)
{
a_DstMeta = a_SrcMeta;
}
return; return;
} }
} }
@ -158,7 +173,10 @@ static void MergeCombinatorLake(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBB
case E_BLOCK_MYCELIUM: case E_BLOCK_MYCELIUM:
{ {
a_DstType = E_BLOCK_STONE; a_DstType = E_BLOCK_STONE;
if (MetaValid) a_DstMeta = 0; if (MetaValid)
{
a_DstMeta = 0;
}
return; return;
} }
} }
@ -178,7 +196,10 @@ static void MergeCombinatorSpongePrint(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcTyp
if (a_SrcType != E_BLOCK_SPONGE) if (a_SrcType != E_BLOCK_SPONGE)
{ {
a_DstType = a_SrcType; a_DstType = a_SrcType;
if (MetaValid) a_DstMeta = a_SrcMeta; if (MetaValid)
{
a_DstMeta = a_SrcMeta;
}
} }
} }
@ -193,12 +214,18 @@ static void MergeCombinatorDifference(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType
if ((a_DstType == a_SrcType) && (!MetaValid || (a_DstMeta == a_SrcMeta))) if ((a_DstType == a_SrcType) && (!MetaValid || (a_DstMeta == a_SrcMeta)))
{ {
a_DstType = E_BLOCK_AIR; a_DstType = E_BLOCK_AIR;
if (MetaValid) a_DstMeta = 0; if (MetaValid)
{
a_DstMeta = 0;
}
} }
else else
{ {
a_DstType = a_SrcType; a_DstType = a_SrcType;
if (MetaValid) a_DstMeta = a_SrcMeta; if (MetaValid)
{
a_DstMeta = a_SrcMeta;
}
} }
} }
@ -214,7 +241,10 @@ static void MergeCombinatorMask(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBB
if ((a_SrcType != a_DstType) || !MetaValid || (a_SrcMeta != a_DstMeta)) if ((a_SrcType != a_DstType) || !MetaValid || (a_SrcMeta != a_DstMeta))
{ {
a_DstType = E_BLOCK_AIR; a_DstType = E_BLOCK_AIR;
if (MetaValid) a_DstMeta = 0; if (MetaValid)
{
a_DstMeta = 0;
}
} }
} }