summaryrefslogtreecommitdiffstats
path: root/src/World.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-10 19:59:11 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-10 19:59:11 +0100
commite672988577e2c894d3bb59ed7f2d5459bca8ef86 (patch)
tree2cd9c62c1217a41b7f75e911f6a6cc42c7b3d858 /src/World.h
parentMerge branch 'master' into awesometnt (diff)
parentMerge pull request #788 from worktycho/warnings (diff)
downloadcuberite-e672988577e2c894d3bb59ed7f2d5459bca8ef86.tar
cuberite-e672988577e2c894d3bb59ed7f2d5459bca8ef86.tar.gz
cuberite-e672988577e2c894d3bb59ed7f2d5459bca8ef86.tar.bz2
cuberite-e672988577e2c894d3bb59ed7f2d5459bca8ef86.tar.lz
cuberite-e672988577e2c894d3bb59ed7f2d5459bca8ef86.tar.xz
cuberite-e672988577e2c894d3bb59ed7f2d5459bca8ef86.tar.zst
cuberite-e672988577e2c894d3bb59ed7f2d5459bca8ef86.zip
Diffstat (limited to 'src/World.h')
-rw-r--r--src/World.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/World.h b/src/World.h
index 7c89bd292..ea24c39d5 100644
--- a/src/World.h
+++ b/src/World.h
@@ -445,7 +445,7 @@ public:
int SpawnExperienceOrb(double a_X, double a_Y, double a_Z, int a_Reward);
/** 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 */
- void SpawnPrimedTNT(double a_X, double a_Y, double a_Z, double a_FuseTimeInSec, double a_InitialVelocityCoeff = 1);
+ void SpawnPrimedTNT(double a_X, double a_Y, double a_Z, int a_FuseTimeInSec = 80, double a_InitialVelocityCoeff = 1);
// tolua_end
@@ -711,7 +711,7 @@ public:
int SpawnMobFinalize(cMonster* a_Monster);
/** Creates a projectile of the specified type. Returns the projectile's EntityID if successful, <0 otherwise */
- int CreateProjectile(double a_PosX, double a_PosY, double a_PosZ, cProjectileEntity::eKind a_Kind, cEntity * a_Creator, const Vector3d * a_Speed = NULL); // tolua_export
+ int CreateProjectile(double a_PosX, double a_PosY, double a_PosZ, cProjectileEntity::eKind a_Kind, cEntity * a_Creator, const cItem a_Item, const Vector3d * a_Speed = NULL); // tolua_export
/** Returns a random number from the m_TickRand in range [0 .. a_Range]. To be used only in the tick thread! */
int GetTickRandomNumber(unsigned a_Range) { return (int)(m_TickRand.randInt(a_Range)); }