Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming)
--HG-- branch : trunk
This commit is contained in:
@@ -786,7 +786,7 @@ public:
|
||||
{
|
||||
EnterEvadeMode();
|
||||
me->MonsterTextEmote(EMOTE_UNABLE_TO_SUMMON, 0);
|
||||
sLog.outError("SD2 ERROR: Unable to summon Maiev Shadowsong (entry: 23197). Check your database to see if you have the proper SQL for Maiev Shadowsong (entry: 23197)");
|
||||
sLog->outError("SD2 ERROR: Unable to summon Maiev Shadowsong (entry: 23197). Check your database to see if you have the proper SQL for Maiev Shadowsong (entry: 23197)");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -314,7 +314,7 @@ public:
|
||||
GridSearcherSucceeded = true;
|
||||
}
|
||||
}
|
||||
} else sLog.outError("SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly");
|
||||
} else sLog->outError("SD2 ERROR: No Channelers are stored in the list. This encounter will not work properly");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -331,13 +331,13 @@ public:
|
||||
if (reseting)
|
||||
return;
|
||||
|
||||
sLog.outDebug("TSCR: Increasing Death Count for Shade of Akama encounter");
|
||||
sLog->outDebug("TSCR: Increasing Death Count for Shade of Akama encounter");
|
||||
++DeathCount;
|
||||
me->RemoveAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2);
|
||||
if (guid)
|
||||
{
|
||||
if (Sorcerers.empty())
|
||||
sLog.outError("SD2 ERROR: Shade of Akama - attempt to remove guid " UI64FMTD " from Sorcerers list but list is already empty", guid);
|
||||
sLog->outError("SD2 ERROR: Shade of Akama - attempt to remove guid " UI64FMTD " from Sorcerers list but list is already empty", guid);
|
||||
else Sorcerers.remove(guid);
|
||||
}
|
||||
}
|
||||
@@ -389,17 +389,17 @@ public:
|
||||
{
|
||||
CAST_AI(mob_ashtongue_channeler::mob_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = me->GetGUID();
|
||||
Channelers.push_back((*itr)->GetGUID());
|
||||
sLog.outDebug("TSCR: Shade of Akama Grid Search found channeler " UI64FMTD ". Adding to list", (*itr)->GetGUID());
|
||||
sLog->outDebug("TSCR: Shade of Akama Grid Search found channeler " UI64FMTD ". Adding to list", (*itr)->GetGUID());
|
||||
}
|
||||
}
|
||||
else sLog.outError("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy");
|
||||
else sLog->outError("SD2 ERROR: Grid Search was unable to find any channelers. Shade of Akama encounter will be buggy");
|
||||
}
|
||||
|
||||
void SetSelectableChannelers()
|
||||
{
|
||||
if (Channelers.empty())
|
||||
{
|
||||
sLog.outError("SD2 ERROR: Channeler List is empty, Shade of Akama encounter will be buggy");
|
||||
sLog->outError("SD2 ERROR: Channeler List is empty, Shade of Akama encounter will be buggy");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -525,7 +525,7 @@ void mob_ashtongue_channeler::mob_ashtongue_channelerAI::JustDied(Unit* /*killer
|
||||
Creature* Shade = (Unit::GetCreature((*me), ShadeGUID));
|
||||
if (Shade && Shade->isAlive())
|
||||
CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount();
|
||||
else sLog.outError("SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama.");
|
||||
else sLog->outError("SD2 ERROR: Channeler dead but unable to increment DeathCount for Shade of Akama.");
|
||||
}
|
||||
|
||||
void mob_ashtongue_sorcerer::mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/)
|
||||
@@ -533,7 +533,7 @@ void mob_ashtongue_sorcerer::mob_ashtongue_sorcererAI::JustDied(Unit* /*killer*/
|
||||
Creature* Shade = (Unit::GetCreature((*me), ShadeGUID));
|
||||
if (Shade && Shade->isAlive())
|
||||
CAST_AI(boss_shade_of_akama::boss_shade_of_akamaAI, Shade->AI())->IncrementDeathCount(me->GetGUID());
|
||||
else sLog.outError("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama.");
|
||||
else sLog->outError("SD2 ERROR: Sorcerer dead but unable to increment DeathCount for Shade of Akama.");
|
||||
}
|
||||
|
||||
class npc_akama_shade : public CreatureScript
|
||||
|
||||
@@ -155,7 +155,7 @@ public:
|
||||
Council[1] = pInstance->GetData64(DATA_VERASDARKSHADOW);
|
||||
Council[2] = pInstance->GetData64(DATA_LADYMALANDE);
|
||||
Council[3] = pInstance->GetData64(DATA_HIGHNETHERMANCERZEREVOR);
|
||||
} else sLog.outError(ERROR_INST_DATA);
|
||||
} else sLog->outError(ERROR_INST_DATA);
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) {}
|
||||
@@ -401,7 +401,7 @@ struct boss_illidari_councilAI : public ScriptedAI
|
||||
}
|
||||
else
|
||||
{
|
||||
sLog.outError(ERROR_INST_DATA);
|
||||
sLog->outError(ERROR_INST_DATA);
|
||||
EnterEvadeMode();
|
||||
return;
|
||||
}
|
||||
@@ -449,7 +449,7 @@ struct boss_illidari_councilAI : public ScriptedAI
|
||||
{
|
||||
if (!pInstance)
|
||||
{
|
||||
sLog.outError(ERROR_INST_DATA);
|
||||
sLog->outError(ERROR_INST_DATA);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -136,7 +136,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
sLog.outDebug("TSCR: Instance Black Temple: GetPlayerInMap, but PlayerList is empty!");
|
||||
sLog->outDebug("TSCR: Instance Black Temple: GetPlayerInMap, but PlayerList is empty!");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user