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/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;
}