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

Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shauren
2010-12-23 23:25:44 +01:00
parent 95daf7998f
commit 928443d899
245 changed files with 5711 additions and 5714 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+1 -1
View File
@@ -238,7 +238,7 @@ public:
if (pInstance)
{
pInstance->SetData(TYPE_RING_OF_LAW,DONE);
sLog.outDebug("TSCR: npc_grimstone: event reached end and set complete.");
sLog->outDebug("TSCR: npc_grimstone: event reached end and set complete.");
}
break;
}
src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+2 -2
View File
@@ -214,7 +214,7 @@ public:
void SetData64(uint32 type, uint64 data)
{
sLog.outDebug("TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data " UI64FMTD ")", type, data);
sLog->outDebug("TSCR: Instance Blackrock Depths: SetData64 update (Type: %u Data " UI64FMTD ")", type, data);
switch(type)
{
@@ -230,7 +230,7 @@ public:
void SetData(uint32 type, uint32 data)
{
sLog.outDebug("TSCR: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data);
sLog->outDebug("TSCR: Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data);
switch(type)
{
src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+1 -1
View File
@@ -353,7 +353,7 @@ public:
Nefarian->setFaction(103);
NefarianGUID = Nefarian->GetGUID();
}
else sLog.outError("TSCR: Blackwing Lair: Unable to spawn nefarian properly.");
else sLog->outError("TSCR: Blackwing Lair: Unable to spawn nefarian properly.");
}
AddSpawnTimer = 4000;
src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+1 -1
View File
@@ -557,7 +557,7 @@ public:
CreatureAI* GetAI(Creature* pCreature) const
{
sLog.outString("TSCR: Convert simpleAI script for Creature Entry %u to ACID", pCreature->GetEntry());
sLog->outString("TSCR: Convert simpleAI script for Creature Entry %u to ACID", pCreature->GetEntry());
SimpleAI* ai = new SimpleAI (pCreature);
ai->Spell[0].Enabled = true;
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+3 -3
View File
@@ -1230,7 +1230,7 @@ public:
}
}
sLog.outError("TSCR: boss_romuloAI: DamageTaken reach end of code, that should not happen.");
sLog->outError("TSCR: boss_romuloAI: DamageTaken reach end of code, that should not happen.");
}
void EnterCombat(Unit* /*who*/)
@@ -1476,7 +1476,7 @@ void boss_julianne::boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &dama
if (Phase == PHASE_ROMULO)
{
sLog.outError("TSCR: boss_julianneAI: cannot take damage in PHASE_ROMULO, why was i here?");
sLog->outError("TSCR: boss_julianneAI: cannot take damage in PHASE_ROMULO, why was i here?");
damage = 0;
return;
}
@@ -1510,7 +1510,7 @@ void boss_julianne::boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &dama
return;
}
}
sLog.outError("TSCR: boss_julianneAI: DamageTaken reach end of code, that should not happen.");
sLog->outError("TSCR: boss_julianneAI: DamageTaken reach end of code, that should not happen.");
}
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+4 -4
View File
@@ -227,7 +227,7 @@ public:
void PrepareEncounter()
{
sLog.outDebug("TSCR: Barnes Opera Event - Introduction complete - preparing encounter %d", m_uiEventId);
sLog->outDebug("TSCR: Barnes Opera Event - Introduction complete - preparing encounter %d", m_uiEventId);
uint8 index = 0;
uint8 count = 0;
@@ -342,17 +342,17 @@ public:
case GOSSIP_ACTION_INFO_DEF+3:
pPlayer->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_OZ;
sLog.outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+4:
pPlayer->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_HOOD;
sLog.outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
break;
case GOSSIP_ACTION_INFO_DEF+5:
pPlayer->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_RAJ;
sLog.outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
sLog->outString("TSCR: player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
break;
}
src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
+1 -1
View File
@@ -62,6 +62,6 @@ enum OperaEvents
EVENT_RAJ = 3
};
#define ERROR_INST_DATA(a) sLog.outError("TSCR: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry());
#define ERROR_INST_DATA(a) sLog->outError("TSCR: Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry());
#endif
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+4 -4
View File
@@ -75,7 +75,7 @@ public:
for (uint8 i = 0; i < size; ++i)
{
uint64 guid = pInstance->GetData64(DATA_FEL_CRYSTAL);
sLog.outDebug("TSCR: Selin: Adding Fel Crystal " UI64FMTD " to list", guid);
sLog->outDebug("TSCR: Selin: Adding Fel Crystal " UI64FMTD " to list", guid);
Crystals.push_back(guid);
}
}
@@ -120,7 +120,7 @@ public:
// Small door opened after event are expected to be closed by default
// Set Inst data for encounter
pInstance->SetData(DATA_SELIN_EVENT, NOT_STARTED);
} else sLog.outError(ERROR_INST_DATA);
} else sLog->outError(ERROR_INST_DATA);
DrainLifeTimer = 3000 + rand()%4000;
DrainManaTimer = DrainLifeTimer + 5000;
@@ -222,7 +222,7 @@ public:
else
{
// Make an error message in case something weird happened here
sLog.outError("TSCR: Selin Fireheart unable to drain crystal as the crystal is either dead or despawned");
sLog->outError("TSCR: Selin Fireheart unable to drain crystal as the crystal is either dead or despawned");
DrainingCrystal = false;
}
}
@@ -362,7 +362,7 @@ public:
}
}
}
} else sLog.outError(ERROR_INST_DATA);
} else sLog->outError(ERROR_INST_DATA);
}
};
src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+1 -1
View File
@@ -181,7 +181,7 @@ public:
{
if (FelCrystals.empty())
{
sLog.outError("TSCR: Magisters Terrace: No Fel Crystals loaded in Inst Data");
sLog->outError("TSCR: Magisters Terrace: No Fel Crystals loaded in Inst Data");
return 0;
}
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+6 -6
View File
@@ -185,7 +185,7 @@ public:
anchorGUID = anchor->GetGUID();
}
else
sLog.outError("npc_unworthy_initiateAI: unable to find anchor!");
sLog->outError("npc_unworthy_initiateAI: unable to find anchor!");
float dist = 99.0f;
GameObject *prison = NULL;
@@ -205,7 +205,7 @@ public:
if (prison)
prison->ResetDoorOrButton();
else
sLog.outError("npc_unworthy_initiateAI: unable to find prison!");
sLog->outError("npc_unworthy_initiateAI: unable to find prison!");
}
break;
case PHASE_TO_EQUIP:
@@ -216,7 +216,7 @@ public:
else
{
me->GetMotionMaster()->MovePoint(1, anchorX, anchorY, me->GetPositionZ());
//sLog.outDebug("npc_unworthy_initiateAI: move to %f %f %f", anchorX, anchorY, me->GetPositionZ());
//sLog->outDebug("npc_unworthy_initiateAI: move to %f %f %f", anchorX, anchorY, me->GetPositionZ());
phase = PHASE_EQUIPING;
wait_timer = 0;
}
@@ -1082,9 +1082,9 @@ public:
{
car->AI()->SetGUID(miner->GetGUID());
CAST_AI(npc_scarlet_miner::npc_scarlet_minerAI, miner->AI())->InitCartQuest(pPlayer);
} else sLog.outError("TSCR: OnGossipHello vehicle entry is not correct.");
} else sLog.outError("TSCR: OnGossipHello player is not on the vehicle.");
} else sLog.outError("TSCR: OnGossipHello Scarlet Miner cant be found by script.");
} else sLog->outError("TSCR: OnGossipHello vehicle entry is not correct.");
} else sLog->outError("TSCR: OnGossipHello player is not on the vehicle.");
} else sLog->outError("TSCR: OnGossipHello Scarlet Miner cant be found by script.");
}
return true;
}
src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+7 -7
View File
@@ -124,7 +124,7 @@ public:
return true;
}
sLog.outDebug("TSCR: Instance Stratholme: Cannot open slaugther square yet.");
sLog->outDebug("TSCR: Instance Stratholme: Cannot open slaugther square yet.");
return false;
}
@@ -220,7 +220,7 @@ public:
break;
Encounter[0] = data;
BaronRun_Timer = 2700000;
sLog.outDebug("TSCR: Instance Stratholme: Baron run in progress.");
sLog->outDebug("TSCR: Instance Stratholme: Baron run in progress.");
break;
case FAIL:
//may add code to remove aura from players, but in theory the time should be up already and removed.
@@ -278,10 +278,10 @@ public:
//UpdateGoState(ziggurat4GUID,0,true);
if (Creature* pBaron = instance->GetCreature(baronGUID))
pBaron->SummonCreature(C_RAMSTEIN,4032.84f,-3390.24f,119.73f,4.71f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000);
sLog.outDebug("TSCR: Instance Stratholme: Ramstein spawned.");
sLog->outDebug("TSCR: Instance Stratholme: Ramstein spawned.");
}
else
sLog.outDebug("TSCR: Instance Stratholme: %u Abomnation left to kill.",count);
sLog->outDebug("TSCR: Instance Stratholme: %u Abomnation left to kill.",count);
}
if (data == NOT_STARTED)
@@ -290,7 +290,7 @@ public:
if (data == DONE)
{
SlaugtherSquare_Timer = 300000;
sLog.outDebug("TSCR: Instance Stratholme: Slaugther event will continue in 5 minutes.");
sLog->outDebug("TSCR: Instance Stratholme: Slaugther event will continue in 5 minutes.");
}
Encounter[4] = data;
break;
@@ -431,7 +431,7 @@ public:
if (GetData(TYPE_BARON_RUN) != DONE)
SetData(TYPE_BARON_RUN, FAIL);
BaronRun_Timer = 0;
sLog.outDebug("TSCR: Instance Stratholme: Baron run event reached end. Event has state %u.",GetData(TYPE_BARON_RUN));
sLog->outDebug("TSCR: Instance Stratholme: Baron run event reached end. Event has state %u.",GetData(TYPE_BARON_RUN));
} else BaronRun_Timer -= diff;
}
@@ -446,7 +446,7 @@ public:
HandleGameObject(ziggurat4GUID, true);
HandleGameObject(ziggurat5GUID, true);
sLog.outDebug("TSCR: Instance Stratholme: Black guard sentries spawned. Opening gates to baron.");
sLog->outDebug("TSCR: Instance Stratholme: Black guard sentries spawned. Opening gates to baron.");
}
SlaugtherSquare_Timer = 0;
} else SlaugtherSquare_Timer -= diff;
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+3 -3
View File
@@ -155,7 +155,7 @@ public:
{
if (!Intro || IsIntro)
return;
sLog.outError("Start Intro");
sLog->outError("Start Intro");
Creature *Madrigosa = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_MADRIGOSA) : 0);
if (Madrigosa)
{
@@ -170,7 +170,7 @@ public:
}else
{
//Madrigosa not found, end intro
sLog.outError("Madrigosa was not found");
sLog->outError("Madrigosa was not found");
EndIntro();
}
}
@@ -180,7 +180,7 @@ public:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
Intro = false;
IsIntro = false;
sLog.outError("End Intro");
sLog->outError("End Intro");
}
void AttackStart(Unit* pWho)
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+1 -1
View File
@@ -272,7 +272,7 @@ public:
}
else
{
sLog.outError("TSCR: Didn't find Shathrowar. Kalecgos event reseted.");
sLog->outError("TSCR: Didn't find Shathrowar. Kalecgos event reseted.");
EnterEvadeMode();
return;
}
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+2 -2
View File
@@ -761,7 +761,7 @@ public:
if (pRandomPlayer)
DoCast(pRandomPlayer, SPELL_LEGION_LIGHTNING, false);
else
sLog.outError("try to cast SPELL_LEGION_LIGHTNING on invalid target");
sLog->outError("try to cast SPELL_LEGION_LIGHTNING on invalid target");
Timer[TIMER_LEGION_LIGHTNING] = (Phase == PHASE_SACRIFICE) ? 18000 : 30000; // 18 seconds in PHASE_SACRIFICE
Timer[TIMER_SOUL_FLAY] = 2500;
@@ -1424,7 +1424,7 @@ public:
DoMeleeAttackIfReady();
break;
}
sLog.outDebug("Sinister-Timer");
sLog->outDebug("Sinister-Timer");
for (uint8 i = 0; i < 3; ++i)
uiTimer[i] -= diff;
}
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+1 -1
View File
@@ -134,7 +134,7 @@ public:
}
}
sLog.outDebug("TSCR: Instance Sunwell Plateau: GetPlayerInMap, but PlayerList is empty!");
sLog->outDebug("TSCR: Instance Sunwell Plateau: GetPlayerInMap, but PlayerList is empty!");
return NULL;
}
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+2 -2
View File
@@ -252,7 +252,7 @@ class boss_janalai : public CreatureScript
cell.Visit(pair, cSearcher, *(me->GetMap()));
}
//sLog.outError("Eggs %d at middle", templist.size());
//sLog->outError("Eggs %d at middle", templist.size());
if (!templist.size())
return false;
@@ -539,7 +539,7 @@ class mob_janalai_hatcher : public CreatureScript
cell.Visit(pair, cSearcher, *(me->GetMap()));
}
//sLog.outError("Eggs %d at %d", templist.size(), side);
//sLog->outError("Eggs %d at %d", templist.size(), side);
for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end() && num > 0; ++i)
if ((*i)->GetDisplayId() != 11686)
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+4 -4
View File
@@ -182,7 +182,7 @@ class instance_zulaman : public InstanceMapScript
ss << "S " << BossKilled << " " << ChestLooted << " " << QuestMinute;
char* data = new char[ss.str().length()+1];
strcpy(data, ss.str().c_str());
//sLog.outError("TSCR: Zul'aman saved, %s.", data);
//sLog->outError("TSCR: Zul'aman saved, %s.", data);
return data;
}
@@ -190,17 +190,17 @@ class instance_zulaman : public InstanceMapScript
{
if (!load) return;
std::istringstream ss(load);
//sLog.outError("TSCR: Zul'aman loaded, %s.", ss.str().c_str());
//sLog->outError("TSCR: Zul'aman loaded, %s.", ss.str().c_str());
char dataHead; // S
uint16 data1, data2, data3;
ss >> dataHead >> data1 >> data2 >> data3;
//sLog.outError("TSCR: Zul'aman loaded, %d %d %d.", data1, data2, data3);
//sLog->outError("TSCR: Zul'aman loaded, %d %d %d.", data1, data2, data3);
if (dataHead == 'S')
{
BossKilled = data1;
ChestLooted = data2;
QuestMinute = data3;
} else sLog.outError("TSCR: Zul'aman: corrupted save data.");
} else sLog->outError("TSCR: Zul'aman: corrupted save data.");
}
void SetData(uint32 type, uint32 data)
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+1 -1
View File
@@ -170,7 +170,7 @@ class boss_arlokk : public CreatureScript
MarkedTargetGUID = pMarkedTarget->GetGUID();
}
else
sLog.outError("TSCR: boss_arlokk could not accuire pMarkedTarget.");
sLog->outError("TSCR: boss_arlokk could not accuire pMarkedTarget.");
m_uiMark_Timer = 15000;
}
src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+1 -1
View File
@@ -322,7 +322,7 @@ public:
void UpdateAI(const uint32 diff)
{
//sLog.outString("DEBUG: p(%i) k(%i) d(%u) W(%i)", Phase, KillCount, diff, WaitTimer);
//sLog->outString("DEBUG: p(%i) k(%i) d(%u) W(%i)", Phase, KillCount, diff, WaitTimer);
if (!QuestInProgress)
return;