From b1d05b0f57e03261eaf776c9bb9b81cfa05a13f5 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 7 Jul 2013 13:06:06 +0000 Subject: Improved function names for protocol packet sending; alpha-sorted the function lists git-svn-id: http://mc-server.googlecode.com/svn/trunk@1659 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Protocol/ProtocolRecognizer.cpp | 61 +++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 20 deletions(-) (limited to 'source/Protocol/ProtocolRecognizer.cpp') diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp index f7c3a1670..0b7887f5c 100644 --- a/source/Protocol/ProtocolRecognizer.cpp +++ b/source/Protocol/ProtocolRecognizer.cpp @@ -200,59 +200,70 @@ void cProtocolRecognizer::SendDisconnect(const AString & a_Reason) -void cProtocolRecognizer::SendEntVelocity(const cEntity & a_Entity) +void cProtocolRecognizer::SendEntityEquipment(const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) { ASSERT(m_Protocol != NULL); - m_Protocol->SendEntVelocity(a_Entity); + m_Protocol->SendEntityEquipment(a_Entity, a_SlotNum, a_Item); } -void cProtocolRecognizer::SendEntHeadLook(const cEntity & a_Entity) + +void cProtocolRecognizer::SendEntityHeadLook(const cEntity & a_Entity) { ASSERT(m_Protocol != NULL); - m_Protocol->SendEntHeadLook(a_Entity); + m_Protocol->SendEntityHeadLook(a_Entity); } -void cProtocolRecognizer::SendEntLook(const cEntity & a_Entity) +void cProtocolRecognizer::SendEntityLook(const cEntity & a_Entity) { ASSERT(m_Protocol != NULL); - m_Protocol->SendEntLook(a_Entity); + m_Protocol->SendEntityLook(a_Entity); } -void cProtocolRecognizer::SendEntRelMove(const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) +void cProtocolRecognizer::SendEntityMetadata(const cEntity & a_Entity) { ASSERT(m_Protocol != NULL); - m_Protocol->SendEntRelMove(a_Entity, a_RelX, a_RelY, a_RelZ); + m_Protocol->SendEntityMetadata(a_Entity); } -void cProtocolRecognizer::SendEntRelMoveLook(const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) +void cProtocolRecognizer::SendEntityProperties(const cEntity & a_Entity) { ASSERT(m_Protocol != NULL); - m_Protocol->SendEntRelMoveLook(a_Entity, a_RelX, a_RelY, a_RelZ); + m_Protocol->SendEntityProperties(a_Entity); } -void cProtocolRecognizer::SendEntityEquipment(const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) +void cProtocolRecognizer::SendEntityRelMove(const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) { ASSERT(m_Protocol != NULL); - m_Protocol->SendEntityEquipment(a_Entity, a_SlotNum, a_Item); + m_Protocol->SendEntityRelMove(a_Entity, a_RelX, a_RelY, a_RelZ); +} + + + + + +void cProtocolRecognizer::SendEntityRelMoveLook(const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) +{ + ASSERT(m_Protocol != NULL); + m_Protocol->SendEntityRelMoveLook(a_Entity, a_RelX, a_RelY, a_RelZ); } @@ -269,6 +280,16 @@ void cProtocolRecognizer::SendEntityStatus(const cEntity & a_Entity, char a_Stat +void cProtocolRecognizer::SendEntityVelocity(const cEntity & a_Entity) +{ + ASSERT(m_Protocol != NULL); + m_Protocol->SendEntityVelocity(a_Entity); +} + + + + + void cProtocolRecognizer::SendExplosion(double a_BlockX, double a_BlockY, double a_BlockZ, float a_Radius, const cVector3iArray & a_BlocksAffected, const Vector3d & a_PlayerMotion) { ASSERT(m_Protocol != NULL); @@ -339,40 +360,40 @@ void cProtocolRecognizer::SendLogin(const cPlayer & a_Player, const cWorld & a_W -void cProtocolRecognizer::SendMetadata(const cEntity & a_Entity) +void cProtocolRecognizer::SendPickupSpawn(const cPickup & a_Pickup) { ASSERT(m_Protocol != NULL); - m_Protocol->SendMetadata(a_Entity); + m_Protocol->SendPickupSpawn(a_Pickup); } -void cProtocolRecognizer::SendPickupSpawn(const cPickup & a_Pickup) +void cProtocolRecognizer::SendPlayerAnimation(const cPlayer & a_Player, char a_Animation) { ASSERT(m_Protocol != NULL); - m_Protocol->SendPickupSpawn(a_Pickup); + m_Protocol->SendPlayerAnimation(a_Player, a_Animation); } -void cProtocolRecognizer::SendPlayerAnimation(const cPlayer & a_Player, char a_Animation) +void cProtocolRecognizer::SendPlayerListItem(const cPlayer & a_Player, bool a_IsOnline) { ASSERT(m_Protocol != NULL); - m_Protocol->SendPlayerAnimation(a_Player, a_Animation); + m_Protocol->SendPlayerListItem(a_Player, a_IsOnline); } -void cProtocolRecognizer::SendPlayerListItem(const cPlayer & a_Player, bool a_IsOnline) +void cProtocolRecognizer::SendPlayerMaxSpeed(void) { ASSERT(m_Protocol != NULL); - m_Protocol->SendPlayerListItem(a_Player, a_IsOnline); + m_Protocol->SendPlayerMaxSpeed(); } -- cgit v1.2.3