1
0

Merge pull request #2704 from Gargaj/patch-1

Fix wolf collars
This commit is contained in:
Mattes D 2015-12-03 16:20:48 +01:00
commit f9a3eb0278

View File

@ -18,7 +18,7 @@ cWolf::cWolf(void) :
m_IsBegging(false),
m_IsAngry(false),
m_OwnerName(""),
m_CollarColor(14)
m_CollarColor(E_META_DYE_ORANGE)
{
m_RelativeWalkSpeed = 2;
}
@ -124,7 +124,7 @@ void cWolf::OnRightClicked(cPlayer & a_Player)
{
if (a_Player.GetName() == m_OwnerName) // Is the player the owner of the dog?
{
SetCollarColor(15 - a_Player.GetEquippedItem().m_ItemDamage);
SetCollarColor(a_Player.GetEquippedItem().m_ItemDamage);
if (!a_Player.IsGameModeCreative())
{
a_Player.GetInventory().RemoveOneEquippedItem();