From fe6fa23a97421af3d02b9faf92b8df2f73abb556 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Wed, 9 Oct 2013 21:02:59 +0100
Subject: Second round of fixes
* Implemented suggestions
---
source/Entities/Entity.h | 67 +-------------------------------------------
source/Entities/Minecart.cpp | 4 +--
source/Entities/Minecart.h | 2 +-
3 files changed, 4 insertions(+), 69 deletions(-)
(limited to 'source/Entities')
diff --git a/source/Entities/Entity.h b/source/Entities/Entity.h
index fdc047cf9..07bc84937 100644
--- a/source/Entities/Entity.h
+++ b/source/Entities/Entity.h
@@ -334,78 +334,13 @@ public:
// tolua_begin
- // Metadata flags; descendants may override the defaults:
+ // COMMON metadata flags; descendants may override the defaults:
virtual bool IsOnFire (void) const {return (m_TicksLeftBurning > 0); }
virtual bool IsCrouched (void) const {return false; }
virtual bool IsRiding (void) const {return false; }
virtual bool IsSprinting(void) const {return false; }
virtual bool IsRclking (void) const {return false; }
virtual bool IsInvisible(void) const {return false; }
-
- // Ageables + Tameables
- virtual bool IsBaby (void) const {return false; }
- virtual bool IsSitting (void) const {return false; }
- virtual bool IsTame (void) const {return false; }
-
- // Creepers
- virtual bool IsCharged (void) const {return false; }
- virtual bool IsBlowing (void) const {return false; }
-
- // Furnace Minecarts & Minecarts
- virtual int LastDamage (void) const {return 0; }
- virtual bool IsFueled (void) const {return false; }
-
- // Bat
- virtual bool IsHanging (void) const {return false; }
-
- // Pig
- virtual bool IsSaddled (void) const {return false; }
-
- // TESTIFICATE
- virtual int GetVilType (void) const {return 0; }
-
- // Zombie
- virtual bool IsVillZomb (void) const {return false; }
- virtual bool IsConvert (void) const {return false; }
-
- // Ghast
- virtual bool IsCharging (void) const {return false; }
-
- // Arrow
- virtual bool IsCritical (void) const {return false; }
-
- // Wolf
- virtual bool IsAngry (void) const {return false; }
- virtual bool IsBegging (void) const {return false; }
- virtual int GetCollar (void) const {return 0; }
-
- // Sheep
- virtual int GetFurColor (void) const {return 0; }
- virtual bool IsSheared (void) const {return false; }
-
- // Enderman
- virtual BLOCKTYPE CarriedBlock (void) const {return E_BLOCK_AIR; }
- virtual NIBBLETYPE CarriedMeta (void) const {return 0; }
- virtual bool IsScream (void) const {return false; }
-
- // Skeleton || Wither Skeleton
- virtual bool IsWither (void) const {return false; }
-
- // Witch
- virtual bool IsNosey (void) const {return false; }
-
- // Slimes and Magma cubes
- virtual int GetSize (void) const {return 1; }
-
- // Horsheys
- virtual bool IsChested (void) const {return false; }
- virtual bool IsEating (void) const {return false; }
- virtual bool IsRearing (void) const {return false; }
- virtual bool IsMthOpen (void) const {return false; }
- virtual int GetHType (void) const {return 0; }
- virtual int GetHColor (void) const {return 0; }
- virtual int GetHStyle (void) const {return 0; }
- virtual int GetHArmour (void) const {return 0; }
// tolua_end
diff --git a/source/Entities/Minecart.cpp b/source/Entities/Minecart.cpp
index 1711e296f..4787f9157 100644
--- a/source/Entities/Minecart.cpp
+++ b/source/Entities/Minecart.cpp
@@ -374,12 +374,12 @@ void cMinecart::DoTakeDamage(TakeDamageInfo & TDI)
}
case mpTNT:
{
- Drops.push_back(cItem(0, 1, 0));
+ Drops.push_back(cItem(E_ITEM_MINECART_WITH_TNT, 1, 0));
break;
}
case mpHopper:
{
- Drops.push_back(cItem(0, 1, 0));
+ Drops.push_back(cItem(E_ITEM_MINECART_WITH_HOPPER, 1, 0));
break;
}
default:
diff --git a/source/Entities/Minecart.h b/source/Entities/Minecart.h
index f974ea76a..b1b48be4e 100644
--- a/source/Entities/Minecart.h
+++ b/source/Entities/Minecart.h
@@ -51,8 +51,8 @@ public:
virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
virtual void DoTakeDamage(TakeDamageInfo & TDI) override;
- int LastDamage(void) const { return m_LastDamage; }
+ int LastDamage(void) const { return m_LastDamage; }
void HandleRailPhysics(float a_Dt, cChunk & a_Chunk);
ePayload GetPayload(void) const { return m_Payload; }
--
cgit v1.2.3