From 6c186ff02a3c57e77ba98fa46afe539aed96accb Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 7 Oct 2012 08:29:56 +0000 Subject: Split the name for signed and unsigned int writing in cProtocol. Hopefully this fixes compilation problems with 64-bit debian ( http://forum.mc-server.org/showthread.php?tid=575 ) git-svn-id: http://mc-server.googlecode.com/svn/trunk@940 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Protocol/Protocol.h | 2 +- source/Protocol/Protocol125.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/Protocol') diff --git a/source/Protocol/Protocol.h b/source/Protocol/Protocol.h index c98f2729b..2e2afd364 100644 --- a/source/Protocol/Protocol.h +++ b/source/Protocol/Protocol.h @@ -126,7 +126,7 @@ protected: SendData((const char *)&a_Value, 4); } - void WriteInt(unsigned int a_Value) + void WriteUInt(unsigned int a_Value) { a_Value = htonl(a_Value); SendData((const char *)&a_Value, 4); diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp index 53b9b55db..66519b0dd 100644 --- a/source/Protocol/Protocol125.cpp +++ b/source/Protocol/Protocol125.cpp @@ -167,12 +167,12 @@ void cProtocol125::SendBlockChanges(int a_ChunkX, int a_ChunkZ, const sSetBlockV WriteInt (a_ChunkX); WriteInt (a_ChunkZ); WriteShort((unsigned short)a_Changes.size()); - WriteInt (sizeof(int) * a_Changes.size()); + WriteUInt (sizeof(int) * a_Changes.size()); for (sSetBlockVector::const_iterator itr = a_Changes.begin(), end = a_Changes.end(); itr != end; ++itr) { unsigned int Coords = itr->y | (itr->z << 8) | (itr->x << 12); unsigned int Blocks = itr->BlockMeta | (itr->BlockType << 4); - WriteInt(Coords << 16 | Blocks); + WriteUInt(Coords << 16 | Blocks); } Flush(); } -- cgit v1.2.3