[2993] Fix build for CMaNGOS 12606

xfurry · xfurry · commit 3dc20b107df8 · 2014-03-16T19:42:30.000+01:00
Require CMaNGOS [12606+]
diff --git a/base/escort_ai.cpp b/base/escort_ai.cpp
@@ -99,7 +99,7 @@ bool npc_escortAI::AssistPlayerInCombat(Unit* pWho)
         return false;
 
     // experimental (unknown) flag not present
-    if (!(m_creature->GetCreatureInfo()->type_flags & CREATURE_TYPEFLAGS_CAN_ASSIST))
+    if (!(m_creature->GetCreatureInfo()->CreatureTypeFlags & CREATURE_TYPEFLAGS_CAN_ASSIST))
         return false;
 
     // unit state prevents (similar check is done in CanInitiateAttack which also include checking unit_flags. We skip those here)
diff --git a/base/follower_ai.cpp b/base/follower_ai.cpp
@@ -49,7 +49,7 @@ bool FollowerAI::AssistPlayerInCombat(Unit* pWho)
         return false;
 
     // experimental (unknown) flag not present
-    if (!(m_creature->GetCreatureInfo()->type_flags & CREATURE_TYPEFLAGS_CAN_ASSIST))
+    if (!(m_creature->GetCreatureInfo()->CreatureTypeFlags & CREATURE_TYPEFLAGS_CAN_ASSIST))
         return false;
 
     // unit state prevents (similar check is done in CanInitiateAttack which also include checking unit_flags. We skip those here)
diff --git a/include/sc_creature.cpp b/include/sc_creature.cpp
@@ -479,7 +479,7 @@ void ScriptedAI::SetEquipmentSlots(bool bLoadDefault, int32 iMainHand, int32 iOf
 {
     if (bLoadDefault)
     {
-        m_creature->LoadEquipment(m_creature->GetCreatureInfo()->equipmentId, true);
+        m_creature->LoadEquipment(m_creature->GetCreatureInfo()->EquipmentTemplateId, true);
         return;
     }
 
diff --git a/scripts/kalimdor/felwood.cpp b/scripts/kalimdor/felwood.cpp
@@ -120,7 +120,7 @@ bool EffectDummyCreature_npc_kitten(Unit* /*pCaster*/, uint32 uiSpellId, SpellEf
             pCreatureTarget->SetEntry(pTemp->Entry);
             pCreatureTarget->SetDisplayId(Creature::ChooseDisplayId(pTemp));
             pCreatureTarget->SetName(pTemp->Name);
-            pCreatureTarget->SetFloatValue(OBJECT_FIELD_SCALE_X, pTemp->scale);
+            pCreatureTarget->SetFloatValue(OBJECT_FIELD_SCALE_X, pTemp->Scale);
         }
 
         if (Unit* pOwner = pCreatureTarget->GetOwner())
diff --git a/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp b/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
@@ -66,7 +66,7 @@ struct MANGOS_DLL_DECL boss_moamAI : public ScriptedAI
     void Aggro(Unit* /*pWho*/) override
     {
         DoScriptText(EMOTE_AGGRO, m_creature);
-        m_creature->SetMaxPower(POWER_MANA, m_creature->GetCreatureInfo()->maxmana);
+        m_creature->SetMaxPower(POWER_MANA, m_creature->GetCreatureInfo()->MaxLevelMana);
     }
 
     void UpdateAI(const uint32 uiDiff) override
diff --git a/scripts/northrend/borean_tundra.cpp b/scripts/northrend/borean_tundra.cpp
@@ -278,7 +278,7 @@ bool EffectAuraDummy_npc_oil_stained_wolf(const Aura* pAura, bool bApply)
         else
         {
             Creature* pCreature = (Creature*)pAura->GetTarget();
-            pCreature->setFaction(pCreature->GetCreatureInfo()->faction_A);
+            pCreature->setFaction(pCreature->GetCreatureInfo()->FactionAlliance);
         }
 
         return true;
diff --git a/scripts/world/mob_generic_creature.cpp b/scripts/world/mob_generic_creature.cpp
@@ -105,7 +105,7 @@ struct MANGOS_DLL_DECL generic_creatureAI : public ScriptedAI
                 else info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE);
 
                 // 50% chance if elite or higher, 20% chance if not, to replace our white hit with a spell
-                if (info && (rand() % (m_creature->GetCreatureInfo()->rank > 1 ? 2 : 5) == 0) && !GlobalCooldown)
+                if (info && (rand() % (m_creature->GetCreatureInfo()->Rank > 1 ? 2 : 5) == 0) && !GlobalCooldown)
                 {
                     // Cast the spell
                     if (Healing)DoCastSpell(m_creature, info);
diff --git a/sd2_revision_nr.h b/sd2_revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "2992"
+ #define SD2_REVISION_NR "2993"
 #endif // __SD2_REVISION_NR_H__
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 CMaNGOS 12587+) ');
+INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for CMaNGOS 12606+) ');
 
 --
 -- Below contains data for table `script_texts` mainly used in C++ parts.
diff --git a/sql/updates/r2993_scriptdev2.sql b/sql/updates/r2993_scriptdev2.sql
@@ -0,0 +1 @@
+UPDATE sd2_db_version SET version='ScriptDev2 (for CMaNGOS 12606+) ';

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ void ScriptedAI::SetEquipmentSlots(bool bLoadDefault, int32 iMainHand, int32 iOf`
`479`	`479`	`{`
`480`	`480`	`if (bLoadDefault)`
`481`	`481`	`{`
`482`		`- m_creature->LoadEquipment(m_creature->GetCreatureInfo()->equipmentId, true);`
	`482`	`+ m_creature->LoadEquipment(m_creature->GetCreatureInfo()->EquipmentTemplateId, true);`
`483`	`483`	`return;`
`484`	`484`	`}`
`485`	`485`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ bool EffectDummyCreature_npc_kitten(Unit* /pCaster/, uint32 uiSpellId, SpellEf`
`120`	`120`	`pCreatureTarget->SetEntry(pTemp->Entry);`
`121`	`121`	`pCreatureTarget->SetDisplayId(Creature::ChooseDisplayId(pTemp));`
`122`	`122`	`pCreatureTarget->SetName(pTemp->Name);`
`123`		`- pCreatureTarget->SetFloatValue(OBJECT_FIELD_SCALE_X, pTemp->scale);`
	`123`	`+ pCreatureTarget->SetFloatValue(OBJECT_FIELD_SCALE_X, pTemp->Scale);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if (Unit* pOwner = pCreatureTarget->GetOwner())`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ struct MANGOS_DLL_DECL boss_moamAI : public ScriptedAI`
`66`	`66`	`void Aggro(Unit* /pWho/) override`
`67`	`67`	`{`
`68`	`68`	`DoScriptText(EMOTE_AGGRO, m_creature);`
`69`		`- m_creature->SetMaxPower(POWER_MANA, m_creature->GetCreatureInfo()->maxmana);`
	`69`	`+ m_creature->SetMaxPower(POWER_MANA, m_creature->GetCreatureInfo()->MaxLevelMana);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`void UpdateAI(const uint32 uiDiff) override`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ bool EffectAuraDummy_npc_oil_stained_wolf(const Aura* pAura, bool bApply)`
`278`	`278`	`else`
`279`	`279`	`{`
`280`	`280`	`Creature* pCreature = (Creature*)pAura->GetTarget();`
`281`		`- pCreature->setFaction(pCreature->GetCreatureInfo()->faction_A);`
	`281`	`+ pCreature->setFaction(pCreature->GetCreatureInfo()->FactionAlliance);`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ struct MANGOS_DLL_DECL generic_creatureAI : public ScriptedAI`
`105`	`105`	`else info = SelectSpell(m_creature->getVictim(), -1, -1, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE);`
`106`	`106`
`107`	`107`	`// 50% chance if elite or higher, 20% chance if not, to replace our white hit with a spell`
`108`		`- if (info && (rand() % (m_creature->GetCreatureInfo()->rank > 1 ? 2 : 5) == 0) && !GlobalCooldown)`
	`108`	`+ if (info && (rand() % (m_creature->GetCreatureInfo()->Rank > 1 ? 2 : 5) == 0) && !GlobalCooldown)`
`109`	`109`	`{`
`110`	`110`	`// Cast the spell`
`111`	`111`	`if (Healing)DoCastSpell(m_creature, info);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+UPDATE sd2_db_version SET version='ScriptDev2 (for CMaNGOS 12606+) ';`