From 0b9b7bc1a8d5cf6f92b802dc376a189ef066e62d Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 20 Apr 2020 20:46:04 +0100 Subject: Unify entity spawn packet sending --- src/Protocol/ProtocolRecognizer.cpp | 43 ++----------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) (limited to 'src/Protocol/ProtocolRecognizer.cpp') diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp index ee6d61cea..d5f40b19b 100644 --- a/src/Protocol/ProtocolRecognizer.cpp +++ b/src/Protocol/ProtocolRecognizer.cpp @@ -550,16 +550,6 @@ void cProtocolRecognizer::SendPaintingSpawn(const cPainting & a_Painting) -void cProtocolRecognizer::SendPickupSpawn(const cPickup & a_Pickup) -{ - ASSERT(m_Protocol != nullptr); - m_Protocol->SendPickupSpawn(a_Pickup); -} - - - - - void cProtocolRecognizer::SendPlayerAbilities(void) { ASSERT(m_Protocol != nullptr); @@ -830,10 +820,10 @@ void cProtocolRecognizer::SendSoundParticleEffect(const EffectID a_EffectID, int -void cProtocolRecognizer::SendSpawnFallingBlock(const cFallingBlock & a_FallingBlock) +void cProtocolRecognizer::SendSpawnEntity(const cEntity & a_Entity) { ASSERT(m_Protocol != nullptr); - m_Protocol->SendSpawnFallingBlock(a_FallingBlock); + m_Protocol->SendSpawnEntity(a_Entity); } @@ -850,26 +840,6 @@ void cProtocolRecognizer::SendSpawnMob(const cMonster & a_Mob) -void cProtocolRecognizer::SendSpawnObject(const cEntity & a_Entity, char a_ObjectType, int a_ObjectData) -{ - ASSERT(m_Protocol != nullptr); - m_Protocol->SendSpawnObject(a_Entity, a_ObjectType, a_ObjectData); -} - - - - - -void cProtocolRecognizer::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) -{ - ASSERT(m_Protocol != nullptr); - m_Protocol->SendSpawnVehicle(a_Vehicle, a_VehicleType, a_VehicleSubType); -} - - - - - void cProtocolRecognizer::SendStatistics(const cStatManager & a_Manager) { ASSERT(m_Protocol != nullptr); @@ -1020,15 +990,6 @@ AString cProtocolRecognizer::GetAuthServerID(void) -UInt32 cProtocolRecognizer::GetProtocolMobType(eMonsterType a_MobType) -{ - return 0; -} - - - - - void cProtocolRecognizer::SendData(const char * a_Data, size_t a_Size) { // This is used only when handling the server ping -- cgit v1.2.3