[1545] Restore compile after movement generator changes in Mangos. Requires Mangos rev 9198+

NoFantasy · NoFantasy · commit 920375f5ea05 · 2010-01-17T09:10:29.000Z
Restore compile after movement generator changes in Mangos. Requires Mangos rev 9198+ git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1545 5f9c896b-1e26-0410-94da-f77f675e2462
diff --git a/base/escort_ai.cpp b/base/escort_ai.cpp
@@ -192,7 +192,7 @@ void npc_escortAI::EnterEvadeMode()
     {
         debug_log("SD2: EscortAI has left combat and is now returning to CombatStartPosition.");
 
-        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
         {
             AddEscortState(STATE_ESCORT_RETURNING);
 
@@ -203,7 +203,7 @@ void npc_escortAI::EnterEvadeMode()
     }
     else
     {
-        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
             m_creature->GetMotionMaster()->MoveTargetedHome();
     }
 
diff --git a/base/follower_ai.cpp b/base/follower_ai.cpp
@@ -166,7 +166,7 @@ void FollowerAI::EnterEvadeMode()
     {
         debug_log("SD2: FollowerAI left combat, returning to CombatStartPosition.");
 
-        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
         {
             float fPosX, fPosY, fPosZ;
             m_creature->GetCombatStartPosition(fPosX, fPosY, fPosZ);
@@ -175,7 +175,7 @@ void FollowerAI::EnterEvadeMode()
     }
     else
     {
-        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+        if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
             m_creature->GetMotionMaster()->MoveTargetedHome();
     }
 
diff --git a/base/guard_ai.cpp b/base/guard_ai.cpp
@@ -164,7 +164,7 @@ void guardAI::UpdateAI(const uint32 diff)
                 GlobalCooldown = GENERIC_CREATURE_COOLDOWN;
 
             }                                               //If no spells available and we arn't moving run to target
-            else if ((*m_creature).GetMotionMaster()->GetCurrentMovementGeneratorType()!=TARGETED_MOTION_TYPE)
+            else if ((*m_creature).GetMotionMaster()->GetCurrentMovementGeneratorType()!=CHASE_MOTION_TYPE)
             {
                 //Cancel our current spell and then mutate new movement generator
                 m_creature->InterruptNonMeleeSpells(false);
diff --git a/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
@@ -401,7 +401,7 @@ struct MANGOS_DLL_DECL boss_janalaiAI : public ScriptedAI
                 DoScriptText(SAY_FIRE_BOMBS, m_creature);
 
                 //first clear movement
-                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
                     m_creature->GetMotionMaster()->MovementExpired();
 
                 //then teleport self
diff --git a/scripts/eastern_kingdoms/zulaman/boss_malacrass.cpp b/scripts/eastern_kingdoms/zulaman/boss_malacrass.cpp
@@ -476,13 +476,13 @@ struct MANGOS_DLL_DECL mob_alyson_antilleAI : public boss_malacrass_addAI
                     DoCast(pTarget, SPELL_FLASH_HEAL);
 
                     //if not already chasing, start chase
-                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
+                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
                         m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), 20.0f);
                 }
                 else
                 {
                     //if chasing, start follow target instead
-                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
                     {
                         m_creature->GetMotionMaster()->MovementExpired();
                         m_creature->GetMotionMaster()->MoveFollow(pTarget, 20.0f, 0.0f);
diff --git a/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp
@@ -185,7 +185,7 @@ struct MANGOS_DLL_DECL boss_ionarAI : public ScriptedAI
             {
                 if (pSpark->isAlive())
                 {
-                    if (pSpark->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+                    if (pSpark->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
                         pSpark->GetMotionMaster()->MovementExpired();
 
                     pSpark->SetSpeed(MOVE_RUN, pSpark->GetCreatureInfo()->speed * 2);
@@ -248,7 +248,7 @@ struct MANGOS_DLL_DECL boss_ionarAI : public ScriptedAI
                     m_uiSplit_Timer = 25000;
                     m_bIsSplitPhase = true;
 
-                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
+                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
                     {
                         if (m_creature->getVictim())
                             m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
@@ -318,7 +318,7 @@ bool EffectDummyCreature_boss_ionar(Unit* pCaster, uint32 uiSpellId, uint32 uiEf
         pCreatureTarget->AttackStop();
         pCreatureTarget->SetVisibility(VISIBILITY_OFF);
 
-        if (pCreatureTarget->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+        if (pCreatureTarget->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
             pCreatureTarget->GetMotionMaster()->MovementExpired();
 
         //always return true when we are handling this spell and effect
diff --git a/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp
@@ -216,7 +216,7 @@ struct MANGOS_DLL_DECL boss_volkhanAI : public ScriptedAI
         {
             if (m_uiPause_Timer < uiDiff)
             {
-                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
+                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
                 {
                     if (m_creature->getVictim())
                         m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
@@ -333,7 +333,7 @@ bool EffectDummyCreature_npc_volkhan_anvil(Unit* pCaster, uint32 uiSpellId, uint
 
         pCaster->AttackStop();
 
-        if (pCaster->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+        if (pCaster->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
             pCaster->GetMotionMaster()->MovementExpired();
 
         ((Creature*)pCaster)->GetMap()->CreatureRelocation((Creature*)pCaster, fX, fY, fZ, pCreatureTarget->GetOrientation());
@@ -411,7 +411,7 @@ struct MANGOS_DLL_DECL mob_molten_golemAI : public ScriptedAI
             m_creature->RemoveAllAuras();
             m_creature->AttackStop();
 
-            if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+            if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
                 m_creature->GetMotionMaster()->MovementExpired();
 
             uiDamage = m_creature->GetHealth()-1;
diff --git a/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
@@ -156,7 +156,7 @@ struct MANGOS_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI
 
                 //expire movement, will prevent from running right back to victim after cast
                 //(but should MoveChase be used again at a certain time or should he not move?)
-                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
                     m_creature->GetMotionMaster()->MovementExpired();
 
                 DoCast(m_creature,SPELL_BLINK);
diff --git a/scripts/outland/coilfang_reservoir/serpent_shrine/boss_lady_vashj.cpp b/scripts/outland/coilfang_reservoir/serpent_shrine/boss_lady_vashj.cpp
@@ -335,7 +335,7 @@ struct MANGOS_DLL_DECL boss_lady_vashjAI : public ScriptedAI
                 {
                     DoScriptText(SAY_PHASE2, m_creature);
 
-                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
                     {
                         //set false, so MoveChase is not triggered in AttackStart
                         SetCombatMovement(false);
@@ -478,7 +478,7 @@ struct MANGOS_DLL_DECL boss_lady_vashjAI : public ScriptedAI
                     SetCombatMovement(true);
 
                     //return to chase top aggro
-                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
+                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
                         m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
 
                     m_uiPhase = PHASE_3;
diff --git a/scripts/outland/coilfang_reservoir/serpent_shrine/boss_leotheras_the_blind.cpp b/scripts/outland/coilfang_reservoir/serpent_shrine/boss_leotheras_the_blind.cpp
@@ -169,7 +169,7 @@ struct MANGOS_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
                 {
                     DoScriptText(SAY_SWITCH_TO_DEMON, m_creature);
 
-                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)
+                    if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
                     {
                         //set false, so MoveChase is not triggered in AttackStart
                         SetCombatMovement(false);
@@ -217,7 +217,7 @@ struct MANGOS_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
                 //switch to nightelf form
                 m_creature->SetDisplayId(MODEL_NIGHTELF);
 
-                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
+                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
                     m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
 
                 //set true
@@ -246,7 +246,7 @@ struct MANGOS_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
                 //switch to nightelf form
                 m_creature->SetDisplayId(MODEL_NIGHTELF);
 
-                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
+                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
                     m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
 
                 //set true
diff --git a/scripts/outland/gruuls_lair/boss_gruul.cpp b/scripts/outland/gruuls_lair/boss_gruul.cpp
@@ -149,7 +149,7 @@ struct MANGOS_DLL_DECL boss_gruulAI : public ScriptedAI
                 m_bPerformingGroundSlam = false;
 
                 //and correct movement, if not already
-                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)
+                if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
                 {
                     if (m_creature->getVictim())
                         m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());
diff --git a/sql/Updates/Makefile.am b/sql/Updates/Makefile.am
@@ -25,4 +25,5 @@ pkgdatadir = $(datadir)/scriptdev2/sql/updates
 #  Install basic SQL files to datadir
 pkgdata_DATA = \
 	r1543_scriptdev2.sql \
-	r1544_mangos.sql
+	r1544_mangos.sql \
+	r1545_scriptdev2.sql
diff --git a/sql/Updates/r1545_scriptdev2.sql b/sql/Updates/r1545_scriptdev2.sql
@@ -0,0 +1 @@
+UPDATE sd2_db_version SET version='ScriptDev2 (for MaNGOS 9198+) ';
diff --git a/sql/scriptdev2_script_full.sql b/sql/scriptdev2_script_full.sql
@@ -3,7 +3,7 @@
 --
 
 DELETE FROM sd2_db_version;
-INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for MaNGOS 9136+) ');
+INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for MaNGOS 9198+) ');
 
 --
 -- Below contains data for table `script_texts` mainly used in C++ parts.

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ void npc_escortAI::EnterEvadeMode()`
`192`	`192`	`{`
`193`	`193`	`debug_log("SD2: EscortAI has left combat and is now returning to CombatStartPosition.");`
`194`	`194`
`195`		`- if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)`
	`195`	`+ if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)`
`196`	`196`	`{`
`197`	`197`	`AddEscortState(STATE_ESCORT_RETURNING);`
`198`	`198`
`@@ -203,7 +203,7 @@ void npc_escortAI::EnterEvadeMode()`
`203`	`203`	`}`
`204`	`204`	`else`
`205`	`205`	`{`
`206`		`- if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)`
	`206`	`+ if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)`
`207`	`207`	`m_creature->GetMotionMaster()->MoveTargetedHome();`
`208`	`208`	`}`
`209`	`209`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ void FollowerAI::EnterEvadeMode()`
`166`	`166`	`{`
`167`	`167`	`debug_log("SD2: FollowerAI left combat, returning to CombatStartPosition.");`
`168`	`168`
`169`		`- if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)`
	`169`	`+ if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)`
`170`	`170`	`{`
`171`	`171`	`float fPosX, fPosY, fPosZ;`
`172`	`172`	`m_creature->GetCombatStartPosition(fPosX, fPosY, fPosZ);`
`@@ -175,7 +175,7 @@ void FollowerAI::EnterEvadeMode()`
`175`	`175`	`}`
`176`	`176`	`else`
`177`	`177`	`{`
`178`		`- if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)`
	`178`	`+ if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)`
`179`	`179`	`m_creature->GetMotionMaster()->MoveTargetedHome();`
`180`	`180`	`}`
`181`	`181`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ void guardAI::UpdateAI(const uint32 diff)`
`164`	`164`	`GlobalCooldown = GENERIC_CREATURE_COOLDOWN;`
`165`	`165`
`166`	`166`	`} //If no spells available and we arn't moving run to target`
`167`		`- else if ((*m_creature).GetMotionMaster()->GetCurrentMovementGeneratorType()!=TARGETED_MOTION_TYPE)`
	`167`	`+ else if ((*m_creature).GetMotionMaster()->GetCurrentMovementGeneratorType()!=CHASE_MOTION_TYPE)`
`168`	`168`	`{`
`169`	`169`	`//Cancel our current spell and then mutate new movement generator`
`170`	`170`	`m_creature->InterruptNonMeleeSpells(false);`
Original file line number	Diff line number	Diff line change
`@@ -476,13 +476,13 @@ struct MANGOS_DLL_DECL mob_alyson_antilleAI : public boss_malacrass_addAI`
`476`	`476`	`DoCast(pTarget, SPELL_FLASH_HEAL);`
`477`	`477`
`478`	`478`	`//if not already chasing, start chase`
`479`		`- if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)`
	`479`	`+ if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)`
`480`	`480`	`m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), 20.0f);`
`481`	`481`	`}`
`482`	`482`	`else`
`483`	`483`	`{`
`484`	`484`	`//if chasing, start follow target instead`
`485`		`- if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)`
	`485`	`+ if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)`
`486`	`486`	`{`
`487`	`487`	`m_creature->GetMotionMaster()->MovementExpired();`
`488`	`488`	`m_creature->GetMotionMaster()->MoveFollow(pTarget, 20.0f, 0.0f);`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ struct MANGOS_DLL_DECL boss_lady_vashjAI : public ScriptedAI`
`335`	`335`	`{`
`336`	`336`	`DoScriptText(SAY_PHASE2, m_creature);`
`337`	`337`
`338`		`- if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE)`
	`338`	`+ if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)`
`339`	`339`	`{`
`340`	`340`	`//set false, so MoveChase is not triggered in AttackStart`
`341`	`341`	`SetCombatMovement(false);`
`@@ -478,7 +478,7 @@ struct MANGOS_DLL_DECL boss_lady_vashjAI : public ScriptedAI`
`478`	`478`	`SetCombatMovement(true);`
`479`	`479`
`480`	`480`	`//return to chase top aggro`
`481`		`- if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE)`
	`481`	`+ if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)`
`482`	`482`	`m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim());`
`483`	`483`
`484`	`484`	`m_uiPhase = PHASE_3;`