summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-03-11 20:41:18 +0100
committerTycho <work.tycho+git@gmail.com>2014-03-11 20:41:18 +0100
commit80cc824c0cf8634439dfb3913cf17af714b03d99 (patch)
tree5c37cf19920f751db08ef79e41cdc8e994165d78
parentMove comment (diff)
downloadcuberite-80cc824c0cf8634439dfb3913cf17af714b03d99.tar
cuberite-80cc824c0cf8634439dfb3913cf17af714b03d99.tar.gz
cuberite-80cc824c0cf8634439dfb3913cf17af714b03d99.tar.bz2
cuberite-80cc824c0cf8634439dfb3913cf17af714b03d99.tar.lz
cuberite-80cc824c0cf8634439dfb3913cf17af714b03d99.tar.xz
cuberite-80cc824c0cf8634439dfb3913cf17af714b03d99.tar.zst
cuberite-80cc824c0cf8634439dfb3913cf17af714b03d99.zip
Diffstat (limited to '')
-rw-r--r--src/ChunkDef.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChunkDef.h b/src/ChunkDef.h
index 5dd64e1b5..61ad49ad0 100644
--- a/src/ChunkDef.h
+++ b/src/ChunkDef.h
@@ -112,7 +112,7 @@ public:
}
- inline static unsigned int MakeIndex(int x, int y, int z )
+ inline static int MakeIndex(int x, int y, int z )
{
if (
(x < Width) && (x > -1) &&
@@ -271,7 +271,7 @@ public:
}
int Index = MakeIndexNoCheck(x, y, z);
- a_Buffer[Index / 2] = (
+ a_Buffer[Index / 2] = static_cast<NIBBLETYPE>(
(a_Buffer[Index / 2] & (0xf0 >> ((Index & 1) * 4))) | // The untouched nibble
((a_Nibble & 0x0f) << ((Index & 1) * 4)) // The nibble being set
);