summaryrefslogtreecommitdiffstats
path: root/src/Entities/Minecart.h
diff options
context:
space:
mode:
authorDamián Imrich <damian@haze.sk>2021-04-03 19:45:20 +0200
committerGitHub <noreply@github.com>2021-04-03 19:45:20 +0200
commit071b7be3d4d08c337c01de7abca034e6c3746194 (patch)
treeb878b6df8abe69493d61098610738edb8d95a82b /src/Entities/Minecart.h
parentFix finisher generating invalid pumpkin (diff)
downloadcuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar
cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar.gz
cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar.bz2
cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar.lz
cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar.xz
cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.tar.zst
cuberite-071b7be3d4d08c337c01de7abca034e6c3746194.zip
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;
} ;