flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed slime-related comments.

Browse Source
This commit is contained in:
madmaxoft 2014-07-18 23:20:42 +02:00
parent 509d3d3b62
commit 19d012c96e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mobs/Monster.cpp
View File

@ -867,13 +867,13 @@ cMonster * cMonster::NewMonsterFromType(cMonster::eType a_MobType)
} }
case mtSlime: case mtSlime:
{ {
toReturn = new cSlime(1 << Random.NextInt(3)); toReturn = new cSlime(1 << Random.NextInt(3)); // Size 1, 2 or 4
break; break;
} }
case mtSkeleton: case mtSkeleton:
{ {
// TODO: Actual detection of spawning in Nether // TODO: Actual detection of spawning in Nether
toReturn = new cSkeleton(Random.NextInt(1) == 0 ? false : true); toReturn = new cSkeleton((Random.NextInt(1) == 0) ? false : true);
break; break;
} }
case mtVillager: case mtVillager:

4
src/Mobs/Slime.cpp
View File

@ -48,9 +48,9 @@ void cSlime::GetDrops(cItems & a_Drops, cEntity * a_Killer)
void cSlime::Attack(float a_Dt) void cSlime::Attack(float a_Dt)
{ {
if (m_Size != 1) if (m_Size > 1)
{ {
// Only slimes with the size 2 and 3 attacks a player. // Only slimes larger than size 1 attack a player.
super::Attack(a_Dt); super::Attack(a_Dt);
} }
} }

7
src/Mobs/Slime.h
View File

@ -18,16 +18,21 @@ public:
CLASS_PROTODEF(cSlime); CLASS_PROTODEF(cSlime);
// cAggressiveMonster overrides:
virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
virtual void Attack(float a_Dt) override; virtual void Attack(float a_Dt) override;
virtual void KilledBy(TakeDamageInfo & a_TDI) override; virtual void KilledBy(TakeDamageInfo & a_TDI) override;
int GetSize(void) const { return m_Size; } int GetSize(void) const { return m_Size; }
/** Returns the text describing the slime's size, as used by the client's resource subsystem for sounds.
Returns either "big" or "small". */
const AString GetSizeName(int a_Size) const; const AString GetSizeName(int a_Size) const;
protected: protected:
/** Size of the slime, 1 .. 3, with 1 being the smallest */ /** Size of the slime, with 1 being the smallest.
Vanilla uses sizes 1, 2 and 4 only. */
int m_Size; int m_Size;
} ; } ;