diff options
author | Alexander Harkness <bearbin@gmail.com> | 2013-10-24 08:36:25 +0200 |
---|---|---|
committer | Alexander Harkness <bearbin@gmail.com> | 2013-10-24 08:36:25 +0200 |
commit | 54f5f71c9a3eb1d7d7516cc750e4bffba86bd585 (patch) | |
tree | 1ff9d4a148086e34f5b78751ec51d470928448ca /source/World.cpp | |
parent | APIDump: Added cChatColor constants. (diff) | |
parent | Pickups now have collection delay when vomited (diff) | |
download | cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar.gz cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar.bz2 cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar.lz cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar.xz cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar.zst cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.zip |
Diffstat (limited to 'source/World.cpp')
-rw-r--r-- | source/World.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/World.cpp b/source/World.cpp index a61c19d63..e2db77666 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -1470,7 +1470,7 @@ bool cWorld::WriteBlockArea(cBlockArea & a_Area, int a_MinBlockX, int a_MinBlock -void cWorld::SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_FlyAwaySpeed) +void cWorld::SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_FlyAwaySpeed, bool IsPlayerCreated) { MTRand r1; a_FlyAwaySpeed /= 1000; // Pre-divide, so that we don't have to divide each time inside the loop @@ -1482,7 +1482,7 @@ void cWorld::SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double cPickup * Pickup = new cPickup( a_BlockX, a_BlockY, a_BlockZ, - *itr, SpeedX, SpeedY, SpeedZ + *itr, IsPlayerCreated, SpeedX, SpeedY, SpeedZ ); Pickup->Initialize(this); } @@ -1492,13 +1492,13 @@ void cWorld::SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double -void cWorld::SpawnItemPickups(const cItems & a_Pickups, double a_BlockX, double a_BlockY, double a_BlockZ, double a_SpeedX, double a_SpeedY, double a_SpeedZ) +void cWorld::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) { for (cItems::const_iterator itr = a_Pickups.begin(); itr != a_Pickups.end(); ++itr) { cPickup * Pickup = new cPickup( a_BlockX, a_BlockY, a_BlockZ, - *itr, (float)a_SpeedX, (float)a_SpeedY, (float)a_SpeedZ + *itr, IsPlayerCreated, (float)a_SpeedX, (float)a_SpeedY, (float)a_SpeedZ ); Pickup->Initialize(this); } |