From 806a6cc3c4d7fac91d39238a304a31a3d42da665 Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Thu, 21 Aug 2014 08:35:00 -0600 Subject: Removed more references to cNewMonster --- src/Protocol/Protocol.h | 1 - src/Protocol/Protocol125.h | 1 - src/Protocol/Protocol17x.h | 1 - src/Protocol/ProtocolRecognizer.cpp | 10 ---------- src/Protocol/ProtocolRecognizer.h | 1 - 5 files changed, 14 deletions(-) (limited to 'src/Protocol') diff --git a/src/Protocol/Protocol.h b/src/Protocol/Protocol.h index 585483ca8..8e1842ec1 100644 --- a/src/Protocol/Protocol.h +++ b/src/Protocol/Protocol.h @@ -28,7 +28,6 @@ class cPickup; class cPainting; class cWorld; class cMonster; -class cNewMonster; class cChunkDataSerializer; class cFallingBlock; class cCompositeChat; diff --git a/src/Protocol/Protocol125.h b/src/Protocol/Protocol125.h index 303b7c6ad..1063777a2 100644 --- a/src/Protocol/Protocol125.h +++ b/src/Protocol/Protocol125.h @@ -174,7 +174,6 @@ protected: /// Writes mobile entity metadata void WriteMobMetadata(const cMonster & a_Mob); - void WriteMobMetadata(const cNewMonster & a_Mob); } ; diff --git a/src/Protocol/Protocol17x.h b/src/Protocol/Protocol17x.h index fff15a67a..ccfa19eb6 100644 --- a/src/Protocol/Protocol17x.h +++ b/src/Protocol/Protocol17x.h @@ -209,7 +209,6 @@ protected: void WriteFPInt(double a_Value); // Writes the double value as a 27:5 fixed-point integer void WriteEntityMetadata(const cEntity & a_Entity); // Writes the metadata for the specified entity, not including the terminating 0x7f void WriteMobMetadata(const cMonster & a_Mob); // Writes the mob-specific metadata for the specified mob - void WriteMobMetadata(const cNewMonster & a_Mob); // Writes the mob-specific metadata for the specified mob void WriteEntityProperties(const cEntity & a_Entity); // Writes the entity properties for the specified entity, including the Count field void WriteBlockEntity(const cBlockEntity & a_BlockEntity); diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp index 543d9bce8..18694572a 100644 --- a/src/Protocol/ProtocolRecognizer.cpp +++ b/src/Protocol/ProtocolRecognizer.cpp @@ -656,16 +656,6 @@ void cProtocolRecognizer::SendSpawnMob(const cMonster & a_Mob) -void cProtocolRecognizer::SendSpawnMob(const cNewMonster & a_Mob) -{ - ASSERT(m_Protocol != NULL); - m_Protocol->SendSpawnMob(a_Mob); -} - - - - - void cProtocolRecognizer::SendSpawnObject(const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) { ASSERT(m_Protocol != NULL); diff --git a/src/Protocol/ProtocolRecognizer.h b/src/Protocol/ProtocolRecognizer.h index 16724cf3a..28572a8fd 100644 --- a/src/Protocol/ProtocolRecognizer.h +++ b/src/Protocol/ProtocolRecognizer.h @@ -117,7 +117,6 @@ public: virtual void SendSoundParticleEffect (int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override; virtual void SendSpawnFallingBlock (const cFallingBlock & a_FallingBlock) override; virtual void SendSpawnMob (const cMonster & a_Mob) override; - virtual void SendSpawnMob (const cNewMonster & a_Mob) override; virtual void SendSpawnObject (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, Byte a_Yaw, Byte a_Pitch) override; virtual void SendSpawnVehicle (const cEntity & a_Vehicle, char a_VehicleType, char a_VehicleSubType) override; virtual void SendStatistics (const cStatManager & a_Manager) override; -- cgit v1.2.3