From e169043a841824eacebeb7db7ecb202a7d3c4b02 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 25 Sep 2016 12:42:05 +0200 Subject: Fixed cCompositeChat's constructor LuaAPI bindings. The tolua-generated constructor would return an extra string value. --- src/ClientHandle.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/ClientHandle.cpp') diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index 303583769..21947af13 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -213,7 +213,7 @@ AString cClientHandle::FormatChatPrefix(bool ShouldAppendChatPrefixes, AString a -AString cClientHandle::FormatMessageType(bool ShouldAppendChatPrefixes, eMessageType a_ChatPrefix, const AString &a_AdditionalData) +AString cClientHandle::FormatMessageType(bool ShouldAppendChatPrefixes, eMessageType a_ChatPrefix, const AString & a_AdditionalData) { switch (a_ChatPrefix) { @@ -237,11 +237,9 @@ AString cClientHandle::FormatMessageType(bool ShouldAppendChatPrefixes, eMessage return Printf("%s: %s", a_AdditionalData.c_str(), cChatColor::LightBlue); } } + case mtMaxPlusOne: break; } - ASSERT(!"Unhandled chat prefix type!"); - #ifndef __clang__ - return ""; - #endif + return ""; } -- cgit v1.2.3 From b268db4caae1b5612ae0f3adabf164efc06de368 Mon Sep 17 00:00:00 2001 From: Moritz Borcherding Date: Sun, 18 Sep 2016 21:43:30 +0200 Subject: Use cChunkDef::Height for Y coord comparison where applicable. --- src/ClientHandle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ClientHandle.cpp') diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index 21947af13..8df60ad40 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -77,11 +77,11 @@ cClientHandle::cClientHandle(const AString & a_IPString, int a_ViewDistance) : m_BlockDigAnimStage(-1), m_BlockDigAnimSpeed(0), m_BlockDigAnimX(0), - m_BlockDigAnimY(256), // Invalid Y, so that the coords don't get picked up + m_BlockDigAnimY(cChunkDef::Height + 1), // Invalid Y, so that the coords don't get picked up m_BlockDigAnimZ(0), m_HasStartedDigging(false), m_LastDigBlockX(0), - m_LastDigBlockY(256), // Invalid Y, so that the coords don't get picked up + m_LastDigBlockY(cChunkDef::Height + 1), // Invalid Y, so that the coords don't get picked up m_LastDigBlockZ(0), m_State(csConnected), m_ShouldCheckDownloaded(false), -- cgit v1.2.3