summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/JukeboxEntity.h
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-09-05 16:56:31 +0200
committerTycho <work.tycho+git@gmail.com>2014-09-05 16:56:31 +0200
commit28f66efe307150558f4ad2546e058370a828be3e (patch)
tree2ef088aa2d1a8ae85007b34b463d5044847bf006 /src/BlockEntities/JukeboxEntity.h
parentMerge branch 'master' into ComponentRewrite (diff)
downloadcuberite-28f66efe307150558f4ad2546e058370a828be3e.tar
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.gz
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.bz2
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.lz
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.xz
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.zst
cuberite-28f66efe307150558f4ad2546e058370a828be3e.zip
Diffstat (limited to 'src/BlockEntities/JukeboxEntity.h')
-rw-r--r--src/BlockEntities/JukeboxEntity.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/BlockEntities/JukeboxEntity.h b/src/BlockEntities/JukeboxEntity.h
index 725585eb3..d677d340f 100644
--- a/src/BlockEntities/JukeboxEntity.h
+++ b/src/BlockEntities/JukeboxEntity.h
@@ -31,7 +31,7 @@ public:
virtual ~cJukeboxEntity();
bool LoadFromJson(const Json::Value & a_Value);
- virtual void SaveToJson(Json::Value & a_Value) /*override*/;
+ virtual void SaveToJson(Json::Value & a_Value) override;
// tolua_begin
@@ -57,8 +57,8 @@ public:
static const char * GetClassStatic(void) { return "cJukeboxEntity"; }
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
- virtual void SendTo(cClientHandle &) /*override*/ {}
+ virtual void UsedBy(cPlayer * a_Player) override;
+ virtual void SendTo(cClientHandle &) override {}
private:
int m_Record;