diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-07-07 17:09:05 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-07-07 17:09:05 +0200 |
| commit | a3c8b12ee99ec53fbbf3b36bd71a8f45cf274c1d (patch) | |
| tree | 555f8bc01382a32af53f112c7ac016073c8cef61 /source/Pickup.cpp | |
| parent | Added StringUtils functions to Lua API; added StripColorCodes(); ChatLog now strips color codes from logged messages. (diff) | |
| download | cuberite-a3c8b12ee99ec53fbbf3b36bd71a8f45cf274c1d.tar cuberite-a3c8b12ee99ec53fbbf3b36bd71a8f45cf274c1d.tar.gz cuberite-a3c8b12ee99ec53fbbf3b36bd71a8f45cf274c1d.tar.bz2 cuberite-a3c8b12ee99ec53fbbf3b36bd71a8f45cf274c1d.tar.lz cuberite-a3c8b12ee99ec53fbbf3b36bd71a8f45cf274c1d.tar.xz cuberite-a3c8b12ee99ec53fbbf3b36bd71a8f45cf274c1d.tar.zst cuberite-a3c8b12ee99ec53fbbf3b36bd71a8f45cf274c1d.zip | |
Diffstat (limited to 'source/Pickup.cpp')
| -rw-r--r-- | source/Pickup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/Pickup.cpp b/source/Pickup.cpp index 797fb84f6..957aa0764 100644 --- a/source/Pickup.cpp +++ b/source/Pickup.cpp @@ -27,11 +27,12 @@ cPickup::cPickup(int a_MicroPosX, int a_MicroPosY, int a_MicroPosZ, const cItem & a_Item, float a_SpeedX /* = 0.f */, float a_SpeedY /* = 0.f */, float a_SpeedZ /* = 0.f */) : cEntity(etPickup, ((double)(a_MicroPosX)) / 32, ((double)(a_MicroPosY)) / 32, ((double)(a_MicroPosZ)) / 32, 0.2, 0.2) - , m_Health(5) , m_Timer( 0.f ) , m_Item(a_Item) , m_bCollected( false ) { + m_MaxHealth = 1; + m_Health = 1; SetSpeed(a_SpeedX, a_SpeedY, a_SpeedZ); m_Gravity = -3.0; } |