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

Fixed a warning and a complaint about a never-read variable.

Browse Source
This commit is contained in:
archshift 2014-05-11 13:44:30 -07:00
parent e0c56b7522
commit 6c57b38b74
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/BlockArea.cpp
View File

@ -2123,7 +2123,7 @@ void cBlockArea::MergeByStrategy(const cBlockArea & a_Src, int a_RelX, int a_Rel
a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(), a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(),
m_Size.x, m_Size.y, m_Size.z m_Size.x, m_Size.y, m_Size.z
); );
break; return;
} // case msOverwrite } // case msOverwrite
case cBlockArea::msFillAir: case cBlockArea::msFillAir:
@ -2137,7 +2137,7 @@ void cBlockArea::MergeByStrategy(const cBlockArea & a_Src, int a_RelX, int a_Rel
a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(), a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(),
m_Size.x, m_Size.y, m_Size.z m_Size.x, m_Size.y, m_Size.z
); );
break; return;
} // case msFillAir } // case msFillAir
case cBlockArea::msImprint: case cBlockArea::msImprint:
@ -2151,7 +2151,7 @@ void cBlockArea::MergeByStrategy(const cBlockArea & a_Src, int a_RelX, int a_Rel
a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(), a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(),
m_Size.x, m_Size.y, m_Size.z m_Size.x, m_Size.y, m_Size.z
); );
break; return;
} // case msImprint } // case msImprint
case cBlockArea::msLake: case cBlockArea::msLake:
@ -2165,7 +2165,7 @@ void cBlockArea::MergeByStrategy(const cBlockArea & a_Src, int a_RelX, int a_Rel
a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(), a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(),
m_Size.x, m_Size.y, m_Size.z m_Size.x, m_Size.y, m_Size.z
); );
break; return;
} // case msLake } // case msLake
case cBlockArea::msSpongePrint: case cBlockArea::msSpongePrint:
@ -2179,7 +2179,7 @@ void cBlockArea::MergeByStrategy(const cBlockArea & a_Src, int a_RelX, int a_Rel
a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(), a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(),
m_Size.x, m_Size.y, m_Size.z m_Size.x, m_Size.y, m_Size.z
); );
break; return;
} // case msSpongePrint } // case msSpongePrint
case cBlockArea::msDifference: case cBlockArea::msDifference:
@ -2193,7 +2193,7 @@ void cBlockArea::MergeByStrategy(const cBlockArea & a_Src, int a_RelX, int a_Rel
a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(), a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(),
m_Size.x, m_Size.y, m_Size.z m_Size.x, m_Size.y, m_Size.z
); );
break; return;
} // case msDifference } // case msDifference
case cBlockArea::msMask: case cBlockArea::msMask:
@ -2207,16 +2207,13 @@ void cBlockArea::MergeByStrategy(const cBlockArea & a_Src, int a_RelX, int a_Rel
a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(), a_Src.GetSizeX(), a_Src.GetSizeY(), a_Src.GetSizeZ(),
m_Size.x, m_Size.y, m_Size.z m_Size.x, m_Size.y, m_Size.z
); );
break; return;
} // case msMask } // case msMask
default:
{
LOGWARNING("Unknown block area merge strategy: %d", a_Strategy);
ASSERT(!"Unknown block area merge strategy");
break;
}
} // switch (a_Strategy) } // switch (a_Strategy)
LOGWARNING("Unknown block area merge strategy: %d", a_Strategy);
ASSERT(!"Unknown block area merge strategy");
return;
} }

1
src/WorldStorage/WorldStorage.cpp
View File

@ -243,7 +243,6 @@ void cWorldStorage::Execute(void)
bool Success; bool Success;
do do
{ {
Success = false;
if (m_ShouldTerminate) if (m_ShouldTerminate)
{ {
return; return;