summaryrefslogtreecommitdiffstats
path: root/src/ClientHandle.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-04-04 13:29:48 +0200
committermadmaxoft <github@xoft.cz>2014-04-04 13:29:48 +0200
commitd77ca77086ddc158355d7d1c4b37ae19eedfe5f7 (patch)
tree5bf093d28fb0be55e4c1447161d3275cc55bb5ff /src/ClientHandle.cpp
parentMerge branch 'master' into HTTPSizeT (diff)
parentExplicit change record size. (diff)
downloadcuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar
cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.gz
cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.bz2
cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.lz
cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.xz
cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.zst
cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.zip
Diffstat (limited to 'src/ClientHandle.cpp')
-rw-r--r--src/ClientHandle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 4513cfb38..5876e55c7 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1064,7 +1064,7 @@ void cClientHandle::HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, e
// If clicked top face and slab occupies the top voxel, we want a slab to be placed above it (therefore increment Y)
// Else if clicked bottom face and slab occupies the bottom voxel, decrement Y for the same reason
// Don't touch coordinates if anything else because a dblslab opportunity is present
- if((ClickedBlockMeta & 0x08) && (a_BlockFace == BLOCK_FACE_TOP))
+ if ((ClickedBlockMeta & 0x08) && (a_BlockFace == BLOCK_FACE_TOP))
{
++a_BlockY;
}
@@ -1532,7 +1532,7 @@ void cClientHandle::HandleTabCompletion(const AString & a_Text)
-void cClientHandle::SendData(const char * a_Data, int a_Size)
+void cClientHandle::SendData(const char * a_Data, size_t a_Size)
{
if (m_HasSentDC)
{
@@ -1547,7 +1547,7 @@ void cClientHandle::SendData(const char * a_Data, int a_Size)
if (m_OutgoingDataOverflow.empty())
{
// No queued overflow data; if this packet fits into the ringbuffer, put it in, otherwise put it in the overflow buffer:
- int CanFit = m_OutgoingData.GetFreeSpace();
+ size_t CanFit = m_OutgoingData.GetFreeSpace();
if (CanFit > a_Size)
{
CanFit = a_Size;