summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol17x.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-09-13 02:20:04 +0200
committerHowaner <franzi.moos@googlemail.com>2014-09-13 02:20:04 +0200
commitb462416e1fef58b3ddccc92f3dfe613fc27d5483 (patch)
treeaf9097c1ca4b284ac0342fc01f221be2fd1240b0 /src/Protocol/Protocol17x.cpp
parentMerge branch 'master' into 1.8-Protocol (diff)
downloadcuberite-b462416e1fef58b3ddccc92f3dfe613fc27d5483.tar
cuberite-b462416e1fef58b3ddccc92f3dfe613fc27d5483.tar.gz
cuberite-b462416e1fef58b3ddccc92f3dfe613fc27d5483.tar.bz2
cuberite-b462416e1fef58b3ddccc92f3dfe613fc27d5483.tar.lz
cuberite-b462416e1fef58b3ddccc92f3dfe613fc27d5483.tar.xz
cuberite-b462416e1fef58b3ddccc92f3dfe613fc27d5483.tar.zst
cuberite-b462416e1fef58b3ddccc92f3dfe613fc27d5483.zip
Diffstat (limited to '')
-rw-r--r--src/Protocol/Protocol17x.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index eaf226841..f36ec5b49 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -715,7 +715,7 @@ void cProtocol172::SendPaintingSpawn(const cPainting & a_Painting)
-void cProtocol172::SendMapColumn(int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length)
+void cProtocol172::SendMapColumn(int a_ID, int a_X, int a_Y, const Byte * a_Colors, unsigned int a_Length, unsigned int m_Scale)
{
ASSERT(m_State == 3); // In game mode?
@@ -737,7 +737,7 @@ void cProtocol172::SendMapColumn(int a_ID, int a_X, int a_Y, const Byte * a_Colo
-void cProtocol172::SendMapDecorators(int a_ID, const cMapDecoratorList & a_Decorators)
+void cProtocol172::SendMapDecorators(int a_ID, const cMapDecoratorList & a_Decorators, unsigned int m_Scale)
{
ASSERT(m_State == 3); // In game mode?
@@ -775,7 +775,6 @@ void cProtocol172::SendMapInfo(int a_ID, unsigned int a_Scale)
-
void cProtocol172::SendPickupSpawn(const cPickup & a_Pickup)
{
ASSERT(m_State == 3); // In game mode?