From a3c8b12ee99ec53fbbf3b36bd71a8f45cf274c1d Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 7 Jul 2013 15:09:05 +0000 Subject: Mobs are assigned MaxHealth from monsters.ini; reading monsters.ini doesn't need settings.ini values anymore. Fixes FS #409. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1662 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Pickup.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/Pickup.cpp') 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; } -- cgit v1.2.3