[1547] Some corrections to followerAi, remove no longer needed checks.

NoFantasy · NoFantasy · commit 6d330dc4f262 · 2010-01-18T11:09:56.000Z
Some corrections to followerAi, remove no longer needed checks. git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1547 5f9c896b-1e26-0410-94da-f77f675e2462
diff --git a/base/follower_ai.cpp b/base/follower_ai.cpp
@@ -4,7 +4,7 @@
 
 /* ScriptData
 SDName: FollowerAI
-SD%Complete: 50
+SD%Complete: 60
 SDComment: This AI is under development
 SDCategory: Npc
 EndScriptData */
@@ -37,9 +37,6 @@ void FollowerAI::AttackStart(Unit* pWho)
         m_creature->SetInCombatWith(pWho);
         pWho->SetInCombatWith(m_creature);
 
-        if (m_creature->hasUnitState(UNIT_STAT_FOLLOW))
-            m_creature->clearUnitState(UNIT_STAT_FOLLOW);
-
         if (IsCombatMovement())
             m_creature->GetMotionMaster()->MoveChase(pWho);
     }
@@ -129,8 +126,8 @@ void FollowerAI::JustDied(Unit* pKiller)
             {
                 if (Player* pMember = pRef->getSource())
                 {
-                    if (pPlayer->GetQuestStatus(m_pQuestForFollow->GetQuestId()) == QUEST_STATUS_INCOMPLETE)
-                        pPlayer->FailQuest(m_pQuestForFollow->GetQuestId());
+                    if (pMember->GetQuestStatus(m_pQuestForFollow->GetQuestId()) == QUEST_STATUS_INCOMPLETE)
+                        pMember->FailQuest(m_pQuestForFollow->GetQuestId());
                 }
             }
         }
@@ -339,10 +336,8 @@ Player* FollowerAI::GetLeaderForFollower()
 
 void FollowerAI::SetFollowComplete(bool bWithEndEvent)
 {
-    if (m_creature->hasUnitState(UNIT_STAT_FOLLOW))
+    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == FOLLOW_MOTION_TYPE)
     {
-        m_creature->clearUnitState(UNIT_STAT_FOLLOW);
-
         m_creature->StopMoving();
         m_creature->GetMotionMaster()->Clear();
         m_creature->GetMotionMaster()->MoveIdle();
@@ -368,10 +363,8 @@ void FollowerAI::SetFollowPaused(bool bPaused)
     {
         AddFollowState(STATE_FOLLOW_PAUSED);
 
-        if (m_creature->hasUnitState(UNIT_STAT_FOLLOW))
+        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == FOLLOW_MOTION_TYPE)
         {
-            m_creature->clearUnitState(UNIT_STAT_FOLLOW);
-
             m_creature->StopMoving();
             m_creature->GetMotionMaster()->Clear();
             m_creature->GetMotionMaster()->MoveIdle();

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`/* ScriptData`
`6`	`6`	`SDName: FollowerAI`
`7`		`-SD%Complete: 50`
	`7`	`+SD%Complete: 60`
`8`	`8`	`SDComment: This AI is under development`
`9`	`9`	`SDCategory: Npc`
`10`	`10`	`EndScriptData */`
`@@ -37,9 +37,6 @@ void FollowerAI::AttackStart(Unit* pWho)`
`37`	`37`	`m_creature->SetInCombatWith(pWho);`
`38`	`38`	`pWho->SetInCombatWith(m_creature);`
`39`	`39`
`40`		`- if (m_creature->hasUnitState(UNIT_STAT_FOLLOW))`
`41`		`- m_creature->clearUnitState(UNIT_STAT_FOLLOW);`
`42`		`-`
`43`	`40`	`if (IsCombatMovement())`
`44`	`41`	`m_creature->GetMotionMaster()->MoveChase(pWho);`
`45`	`42`	`}`
`@@ -129,8 +126,8 @@ void FollowerAI::JustDied(Unit* pKiller)`
`129`	`126`	`{`
`130`	`127`	`if (Player* pMember = pRef->getSource())`
`131`	`128`	`{`
`132`		`- if (pPlayer->GetQuestStatus(m_pQuestForFollow->GetQuestId()) == QUEST_STATUS_INCOMPLETE)`
`133`		`- pPlayer->FailQuest(m_pQuestForFollow->GetQuestId());`
	`129`	`+ if (pMember->GetQuestStatus(m_pQuestForFollow->GetQuestId()) == QUEST_STATUS_INCOMPLETE)`
	`130`	`+ pMember->FailQuest(m_pQuestForFollow->GetQuestId());`
`134`	`131`	`}`
`135`	`132`	`}`
`136`	`133`	`}`
`@@ -339,10 +336,8 @@ Player* FollowerAI::GetLeaderForFollower()`
`339`	`336`
`340`	`337`	`void FollowerAI::SetFollowComplete(bool bWithEndEvent)`
`341`	`338`	`{`
`342`		`- if (m_creature->hasUnitState(UNIT_STAT_FOLLOW))`
	`339`	`+ if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == FOLLOW_MOTION_TYPE)`
`343`	`340`	`{`
`344`		`- m_creature->clearUnitState(UNIT_STAT_FOLLOW);`
`345`		`-`
`346`	`341`	`m_creature->StopMoving();`
`347`	`342`	`m_creature->GetMotionMaster()->Clear();`
`348`	`343`	`m_creature->GetMotionMaster()->MoveIdle();`
`@@ -368,10 +363,8 @@ void FollowerAI::SetFollowPaused(bool bPaused)`
`368`	`363`	`{`
`369`	`364`	`AddFollowState(STATE_FOLLOW_PAUSED);`
`370`	`365`
`371`		`- if (m_creature->hasUnitState(UNIT_STAT_FOLLOW))`
	`366`	`+ if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == FOLLOW_MOTION_TYPE)`
`372`	`367`	`{`
`373`		`- m_creature->clearUnitState(UNIT_STAT_FOLLOW);`
`374`		`-`
`375`	`368`	`m_creature->StopMoving();`
`376`	`369`	`m_creature->GetMotionMaster()->Clear();`
`377`	`370`	`m_creature->GetMotionMaster()->MoveIdle();`