From b55e5f5ad142404a5e376bb65f963acf1a4f8ff3 Mon Sep 17 00:00:00 2001 From: Lukas Pioch Date: Thu, 24 Aug 2017 13:26:23 +0200 Subject: Use ref instead of pointer --- src/Mobs/Monster.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Mobs/Monster.cpp') diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index d1c2413c3..26db4b3dd 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -431,7 +431,7 @@ void cMonster::CalcLeashActions() auto LeashKnot = cLeashKnot::FindKnotAtPos(*m_World, { FloorC(m_LeashToPos->x), FloorC(m_LeashToPos->y), FloorC(m_LeashToPos->z) }); if (LeashKnot != nullptr) { - LeashTo(LeashKnot); + LeashTo(*LeashKnot); SetLeashToPos(nullptr); } } @@ -688,7 +688,7 @@ void cMonster::OnRightClicked(cPlayer & a_Player) { a_Player.GetInventory().RemoveOneEquippedItem(); } - LeashTo(&a_Player); + LeashTo(a_Player); } } @@ -1407,7 +1407,7 @@ cMonster::eFamily cMonster::GetMobFamily(void) const -void cMonster::LeashTo(cEntity * a_Entity, bool a_ShouldBroadcast) +void cMonster::LeashTo(cEntity & a_Entity, bool a_ShouldBroadcast) { // Do nothing if already leashed if (m_LeashedTo != nullptr) @@ -1415,13 +1415,13 @@ void cMonster::LeashTo(cEntity * a_Entity, bool a_ShouldBroadcast) return; } - m_LeashedTo = a_Entity; + m_LeashedTo = &a_Entity; - a_Entity->AddLeashedMob(this); + a_Entity.AddLeashedMob(this); if (a_ShouldBroadcast) { - m_World->BroadcastLeashEntity(*this, *a_Entity); + m_World->BroadcastLeashEntity(*this, a_Entity); } m_IsLeashActionJustDone = true; -- cgit v1.2.3