flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Rename HandleBlockDigCancel to FinishDigAnimtion.

Browse Source
This commit is contained in:
Howaner 2014-05-11 11:56:15 +02:00
parent eb0f713b6a
commit 5c9f89526a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ClientHandle.cpp
View File

@ -878,7 +878,7 @@ void cClientHandle::HandleLeftClick(int a_BlockX, int a_BlockY, int a_BlockZ, eB
case DIG_STATUS_CANCELLED: case DIG_STATUS_CANCELLED:
{ {
// Block breaking cancelled by player // Block breaking cancelled by player
HandleBlockDigCancel(); FinishDigAnimation();
return; return;
} }
@ -998,7 +998,7 @@ void cClientHandle::HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_Blo
return; return;
} }
HandleBlockDigCancel(); FinishDigAnimation();
cItemHandler * ItemHandler = cItemHandler::GetItemHandler(m_Player->GetEquippedItem()); cItemHandler * ItemHandler = cItemHandler::GetItemHandler(m_Player->GetEquippedItem());
@ -1041,7 +1041,7 @@ void cClientHandle::HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_Blo
void cClientHandle::HandleBlockDigCancel() void cClientHandle::FinishDigAnimation()
{ {
if ( if (
!m_HasStartedDigging || // Hasn't received the DIG_STARTED packet !m_HasStartedDigging || // Hasn't received the DIG_STARTED packet

4
src/ClientHandle.h
View File

@ -374,8 +374,8 @@ private:
/** Handles the DIG_FINISHED dig packet: */ /** Handles the DIG_FINISHED dig packet: */
void HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, BLOCKTYPE a_OldBlock, NIBBLETYPE a_OldMeta); void HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, BLOCKTYPE a_OldBlock, NIBBLETYPE a_OldMeta);
/** Handles the DIG_CANCELLED dig packet: */ /** The clients will receive a finished dig animation */
void HandleBlockDigCancel(); void FinishDigAnimation();
/** Converts the protocol-formatted channel list (NUL-separated) into a proper string vector. */ /** Converts the protocol-formatted channel list (NUL-separated) into a proper string vector. */
AStringVector BreakApartPluginChannels(const AString & a_PluginChannels); AStringVector BreakApartPluginChannels(const AString & a_PluginChannels);