josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts/Karazhan: Fixed some uninitialized variables

Browse Source
This commit is contained in:
Shauren
2012-08-12 14:16:11 +02:00
parent 666602e1aa
commit 7d29e585df
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+6 -16
View File
@@ -75,8 +75,8 @@ public:
{ {
boss_moroesAI(Creature* creature) : ScriptedAI(creature) boss_moroesAI(Creature* creature) : ScriptedAI(creature)
{ {
for (uint8 i = 0; i < 4; ++i) memset(AddId, 0, sizeof(AddId));
AddId[i] = 0; memset(AddGUID, 0, sizeof(AddGUID));
instance = creature->GetInstanceScript(); instance = creature->GetInstanceScript();
} }
@@ -105,10 +105,8 @@ public:
Enrage = false; Enrage = false;
InVanish = false; InVanish = false;
if (me->GetHealth() > 0) if (me->GetHealth())
{
SpawnAdds(); SpawnAdds();
}
if (instance) if (instance)
instance->SetData(TYPE_MOROES, NOT_STARTED); instance->SetData(TYPE_MOROES, NOT_STARTED);
@@ -193,10 +191,9 @@ public:
bool isAddlistEmpty() bool isAddlistEmpty()
{ {
for (uint8 i = 0; i < 4; ++i) for (uint8 i = 0; i < 4; ++i)
{
if (AddId[i] == 0) if (AddId[i] == 0)
return true; return true;
}
return false; return false;
} }
@@ -341,18 +338,11 @@ struct boss_moroes_guestAI : public ScriptedAI
if (!instance) if (!instance)
return; return;
uint64 MoroesGUID = instance->GetData64(DATA_MOROES); if (Creature* Moroes = Unit::GetCreature(*me, instance->GetData64(DATA_MOROES)))
Creature* Moroes = (Unit::GetCreature((*me), MoroesGUID));
if (Moroes)
{
for (uint8 i = 0; i < 4; ++i) for (uint8 i = 0; i < 4; ++i)
{ if (uint64 GUID = CAST_AI(boss_moroes::boss_moroesAI, Moroes->AI())->AddGUID[i])
uint64 GUID = CAST_AI(boss_moroes::boss_moroesAI, Moroes->AI())->AddGUID[i];
if (GUID)
GuestGUID[i] = GUID; GuestGUID[i] = GUID;
} }
}
}
Unit* SelectGuestTarget() Unit* SelectGuestTarget()
{ {
src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+4
View File
@@ -187,6 +187,7 @@ public:
boss_malchezaarAI(Creature* creature) : ScriptedAI(creature) boss_malchezaarAI(Creature* creature) : ScriptedAI(creature)
{ {
instance = creature->GetInstanceScript(); instance = creature->GetInstanceScript();
memset(axes, 0, sizeof(axes));
} }
InstanceScript* instance; InstanceScript* instance;
@@ -218,7 +219,10 @@ public:
positions.clear(); positions.clear();
for (uint8 i = 0; i < 5; ++i) for (uint8 i = 0; i < 5; ++i)
{
enfeeble_targets[i] = 0; enfeeble_targets[i] = 0;
enfeeble_health[i] = 0;
}
for (uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i) for (uint8 i = 0; i < TOTAL_INFERNAL_POINTS; ++i)
positions.push_back(&InfernalPoints[i]); positions.push_back(&InfernalPoints[i]);