summaryrefslogtreecommitdiffstats
path: root/src/World.h
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2017-09-07 10:25:34 +0200
committerMattes D <github@xoft.cz>2017-09-07 10:25:34 +0200
commit104f9e127b259731836c2b88d74a8d731f3ad535 (patch)
tree0aa333690caf9480f38e2ec1a88265b84544aeb5 /src/World.h
parentAdd cWorld::RemoveEntity and use in cEntity (#4003) (diff)
downloadcuberite-104f9e127b259731836c2b88d74a8d731f3ad535.tar
cuberite-104f9e127b259731836c2b88d74a8d731f3ad535.tar.gz
cuberite-104f9e127b259731836c2b88d74a8d731f3ad535.tar.bz2
cuberite-104f9e127b259731836c2b88d74a8d731f3ad535.tar.lz
cuberite-104f9e127b259731836c2b88d74a8d731f3ad535.tar.xz
cuberite-104f9e127b259731836c2b88d74a8d731f3ad535.tar.zst
cuberite-104f9e127b259731836c2b88d74a8d731f3ad535.zip
Diffstat (limited to 'src/World.h')
-rw-r--r--src/World.h18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/World.h b/src/World.h
index b1a5e8d79..87110a5cf 100644
--- a/src/World.h
+++ b/src/World.h
@@ -457,18 +457,32 @@ public:
Returns the UniqueID of the spawned minecart, or cEntity::INVALID_ID on failure. */
UInt32 SpawnMinecart(double a_X, double a_Y, double a_Z, int a_MinecartType, const cItem & a_Content = cItem(), int a_BlockHeight = 1);
+ // DEPRECATED, use the vector-parametered version instead.
+ UInt32 SpawnBoat(double a_X, double a_Y, double a_Z, cBoat::eMaterial a_Material)
+ {
+ LOGWARNING("cWorld::SpawnBoat(double, double, double) is deprecated, use cWorld::SpawnBoat(Vector3d) instead.");
+ return SpawnBoat({a_X, a_Y, a_Z}, a_Material);
+ }
+
/** Spawns a boat at the given coordinates.
Returns the UniqueID of the spawned boat, or cEntity::INVALID_ID on failure. */
- UInt32 SpawnBoat(double a_X, double a_Y, double a_Z, cBoat::eMaterial a_Material);
+ UInt32 SpawnBoat(Vector3d a_Pos, cBoat::eMaterial a_Material);
/** Spawns an experience orb at the given location with the given reward.
Returns the UniqueID of the spawned experience orb, or cEntity::INVALID_ID on failure. */
virtual UInt32 SpawnExperienceOrb(double a_X, double a_Y, double a_Z, int a_Reward) override;
+ // DEPRECATED, use the vector-parametered version instead.
+ UInt32 SpawnPrimedTNT(double a_X, double a_Y, double a_Z, int a_FuseTimeInSec = 80, double a_InitialVelocityCoeff = 1)
+ {
+ LOGWARNING("cWorld::SpawnPrimedTNT(double, double, double) is deprecated, use cWorld::SpawnPrimedTNT(Vector3d) instead.");
+ return SpawnPrimedTNT({a_X, a_Y, a_Z}, a_FuseTimeInSec, a_InitialVelocityCoeff);
+ }
+
/** Spawns a new primed TNT entity at the specified block coords and specified fuse duration.
Initial velocity is given based on the relative coefficient provided.
Returns the UniqueID of the created entity, or cEntity::INVALID_ID on failure. */
- UInt32 SpawnPrimedTNT(double a_X, double a_Y, double a_Z, int a_FuseTimeInSec = 80, double a_InitialVelocityCoeff = 1);
+ UInt32 SpawnPrimedTNT(Vector3d a_Pos, int a_FuseTimeInSec = 80, double a_InitialVelocityCoeff = 1);
// tolua_end