summaryrefslogtreecommitdiffstats
path: root/src/World.h
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-02-18 08:25:29 +0100
committermadmaxoft <github@xoft.cz>2014-02-18 13:49:23 +0100
commitfc8743df9671172158d9d491843b8e208d3e25f3 (patch)
tree2880f6990c76845c48abea090dbc94bdd37344bd /src/World.h
parentUpdated Core (diff)
downloadcuberite-fc8743df9671172158d9d491843b8e208d3e25f3.tar
cuberite-fc8743df9671172158d9d491843b8e208d3e25f3.tar.gz
cuberite-fc8743df9671172158d9d491843b8e208d3e25f3.tar.bz2
cuberite-fc8743df9671172158d9d491843b8e208d3e25f3.tar.lz
cuberite-fc8743df9671172158d9d491843b8e208d3e25f3.tar.xz
cuberite-fc8743df9671172158d9d491843b8e208d3e25f3.tar.zst
cuberite-fc8743df9671172158d9d491843b8e208d3e25f3.zip
Diffstat (limited to '')
-rw-r--r--src/World.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/World.h b/src/World.h
index 97358b88a..f885040ba 100644
--- a/src/World.h
+++ b/src/World.h
@@ -64,7 +64,10 @@ typedef cItemCallback<cCommandBlockEntity> cCommandBlockCallback;
// tolua_begin
-class cWorld : public cForEachChunkProvider, public cWorldInterface, public cBroadcastInterface
+class cWorld :
+ public cForEachChunkProvider,
+ public cWorldInterface,
+ public cBroadcastInterface
{
public:
@@ -401,15 +404,15 @@ public:
Prefer cBlockArea::Write() instead, this is the internal implementation; cBlockArea does error checking, too.
a_DataTypes is a bitmask of cBlockArea::baXXX constants ORed together.
*/
- virtual bool WriteBlockArea(cBlockArea & a_Area, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes);
+ virtual bool WriteBlockArea(cBlockArea & a_Area, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes) override;
// tolua_begin
/** Spawns item pickups for each item in the list. May compress pickups if too many entities: */
- virtual void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_FlyAwaySpeed = 1.0, bool IsPlayerCreated = false);
+ virtual void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_FlyAwaySpeed = 1.0, bool IsPlayerCreated = false); // override; cannot specify it here due to tolua
/** Spawns item pickups for each item in the list. May compress pickups if too many entities. All pickups get the speed specified: */
- virtual void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_SpeedX, double a_SpeedY, double a_SpeedZ, bool IsPlayerCreated = false);
+ virtual void SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_SpeedX, double a_SpeedY, double a_SpeedZ, bool IsPlayerCreated = false); // override; cannot specify it here due to tolua
/** Spawns an falling block entity at the given position. It returns the UniqueID of the spawned falling block. */
int SpawnFallingBlock(int a_X, int a_Y, int a_Z, BLOCKTYPE BlockType, NIBBLETYPE BlockMeta);