summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-09-27 20:19:28 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-09-27 20:19:28 +0200
commit7ce09a9113d693b85fdda13b3c04a8b8eb900153 (patch)
tree49c3c3742cff4c38a33bd5014dd9c57c0dcea71c /src/Entities
parentMerge remote-tracking branch 'origin/master' into chestcarts (diff)
downloadcuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar.gz
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar.bz2
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar.lz
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar.xz
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar.zst
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Minecart.cpp4
-rw-r--r--src/Entities/Minecart.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 42ac57a07..c5e1c07d5 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -7,7 +7,6 @@
#include "Globals.h"
#include "Minecart.h"
-#include "../World.h"
#include "../ClientHandle.h"
#include "../Chunk.h"
#include "Player.h"
@@ -1107,7 +1106,8 @@ void cRideableMinecart::OnRightClicked(cPlayer & a_Player)
cMinecartWithChest::cMinecartWithChest(double a_X, double a_Y, double a_Z) :
super(mpChest, a_X, a_Y, a_Z),
- m_Contents(ContentsWidth, ContentsHeight)
+ m_Contents(ContentsWidth, ContentsHeight),
+ cEntityWindowOwner(this)
{
m_Contents.AddListener(*this);
}
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h
index f77a171ba..6b6ad36b5 100644
--- a/src/Entities/Minecart.h
+++ b/src/Entities/Minecart.h
@@ -10,6 +10,7 @@
#pragma once
#include "Entity.h"
+#include "World.h"
#include "../UI/WindowOwner.h"
@@ -111,7 +112,7 @@ protected:
class cMinecartWithChest :
public cMinecart,
public cItemGrid::cListener,
- public cWindowOwner
+ public cEntityWindowOwner
{
typedef cMinecart super;