summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 14:55:06 +0100
committermadmaxoft <github@xoft.cz>2013-12-31 09:16:40 +0100
commit25d42c44d5d9cbd3eb1178fde50cf9b271e4a96e (patch)
treef3bbec0695ca2b641e6b36d1cd7610ef32e78f40
parentMerge pull request #488 from Diusrex/master (diff)
downloadcuberite-25d42c44d5d9cbd3eb1178fde50cf9b271e4a96e.tar
cuberite-25d42c44d5d9cbd3eb1178fde50cf9b271e4a96e.tar.gz
cuberite-25d42c44d5d9cbd3eb1178fde50cf9b271e4a96e.tar.bz2
cuberite-25d42c44d5d9cbd3eb1178fde50cf9b271e4a96e.tar.lz
cuberite-25d42c44d5d9cbd3eb1178fde50cf9b271e4a96e.tar.xz
cuberite-25d42c44d5d9cbd3eb1178fde50cf9b271e4a96e.tar.zst
cuberite-25d42c44d5d9cbd3eb1178fde50cf9b271e4a96e.zip
Diffstat (limited to '')
-rw-r--r--src/BlockArea.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp
index 1148908c6..dd8e0da31 100644
--- a/src/BlockArea.cpp
+++ b/src/BlockArea.cpp
@@ -28,6 +28,8 @@ template<typename Combinator> void InternalMergeBlocks(
Combinator a_Combinator
)
{
+ UNUSED(a_SrcSizeY);
+ UNUSED(a_DstSizeY);
for (int y = 0; y < a_SizeY; y++)
{
int SrcBaseY = (y + a_SrcOffY) * a_SrcSizeX * a_SrcSizeZ;