summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorarchshift <admin@archshft.com>2014-05-11 22:44:30 +0200
committerarchshift <admin@archshft.com>2014-05-11 22:44:30 +0200
commit6c57b38b741787cd53a42b905d27e2d137ae194b (patch)
tree62fae8201177bb95b72b934ec20f704dd69eff6a /src
parentMerge pull request #972 from mc-server/SslWebAdmin (diff)
downloadcuberite-6c57b38b741787cd53a42b905d27e2d137ae194b.tar
cuberite-6c57b38b741787cd53a42b905d27e2d137ae194b.tar.gz
cuberite-6c57b38b741787cd53a42b905d27e2d137ae194b.tar.bz2
cuberite-6c57b38b741787cd53a42b905d27e2d137ae194b.tar.lz
cuberite-6c57b38b741787cd53a42b905d27e2d137ae194b.tar.xz
cuberite-6c57b38b741787cd53a42b905d27e2d137ae194b.tar.zst
cuberite-6c57b38b741787cd53a42b905d27e2d137ae194b.zip
Diffstat (limited to '')
-rw-r--r--src/BlockArea.cpp25
-rw-r--r--src/WorldStorage/WorldStorage.cpp1
2 files changed, 11 insertions, 15 deletions
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp
index 9e20a0983..aff0bf9c6 100644
--- a/src/BlockArea.cpp
+++ b/src/BlockArea.cpp
@@ -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(),
m_Size.x, m_Size.y, m_Size.z
);
- break;
+ return;
} // case msOverwrite
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(),
m_Size.x, m_Size.y, m_Size.z
);
- break;
+ return;
} // case msFillAir
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(),
m_Size.x, m_Size.y, m_Size.z
);
- break;
+ return;
} // case msImprint
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(),
m_Size.x, m_Size.y, m_Size.z
);
- break;
+ return;
} // case msLake
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(),
m_Size.x, m_Size.y, m_Size.z
);
- break;
+ return;
} // case msSpongePrint
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(),
m_Size.x, m_Size.y, m_Size.z
);
- break;
+ return;
} // case msDifference
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(),
m_Size.x, m_Size.y, m_Size.z
);
- break;
+ return;
} // case msMask
-
- default:
- {
- LOGWARNING("Unknown block area merge strategy: %d", a_Strategy);
- ASSERT(!"Unknown block area merge strategy");
- break;
- }
} // switch (a_Strategy)
+
+ LOGWARNING("Unknown block area merge strategy: %d", a_Strategy);
+ ASSERT(!"Unknown block area merge strategy");
+ return;
}
diff --git a/src/WorldStorage/WorldStorage.cpp b/src/WorldStorage/WorldStorage.cpp
index 54eaaca5c..6867ad5bc 100644
--- a/src/WorldStorage/WorldStorage.cpp
+++ b/src/WorldStorage/WorldStorage.cpp
@@ -243,7 +243,6 @@ void cWorldStorage::Execute(void)
bool Success;
do
{
- Success = false;
if (m_ShouldTerminate)
{
return;