summaryrefslogtreecommitdiffstats
path: root/src/Entities/Minecart.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Entities/Minecart.h')
-rw-r--r--src/Entities/Minecart.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h
index a98014799..0d62d98f1 100644
--- a/src/Entities/Minecart.h
+++ b/src/Entities/Minecart.h
@@ -105,10 +105,10 @@ public:
CLASS_PROTODEF(cRideableMinecart)
- cRideableMinecart(Vector3d a_Pos, const cItem & a_Content, int a_Height);
+ cRideableMinecart(Vector3d a_Pos, const cItem & a_Content, int a_ContentHeight);
- const cItem & GetContent(void) const {return m_Content;}
- int GetBlockHeight(void) const {return m_Height;}
+ const cItem & GetContent(void) const { return m_Content; }
+ int GetBlockHeight(void) const { return m_ContentHeight; }
// cEntity overrides:
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = nullptr) override;
@@ -116,9 +116,8 @@ public:
protected:
-
cItem m_Content;
- int m_Height;
+ int m_ContentHeight;
} ;