diff options
| author | Shauren <none@none> | 2010-12-23 23:25:44 +0100 |
|---|---|---|
| committer | Shauren <none@none> | 2010-12-23 23:25:44 +0100 |
| commit | 928443d8993869dfbf3adceabe4ba0b3cfe0edef (patch) | |
| tree | b30f1385e6f2dd8d95357590593aa2988b094593 /src/server/game/Tools | |
| parent | 95daf7998fc3b772fdcd70087c12db80bd5a031a (diff) | |
Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming)
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Tools')
| -rw-r--r-- | src/server/game/Tools/CharacterDatabaseCleaner.cpp | 10 | ||||
| -rwxr-xr-x | src/server/game/Tools/PlayerDump.cpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index 2a949c03db8..ed85d8cb062 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -25,10 +25,10 @@ void CharacterDatabaseCleaner::CleanDatabase() { // config to disable - if(!sWorld.getBoolConfig(CONFIG_CLEAN_CHARACTER_DB)) + if(!sWorld->getBoolConfig(CONFIG_CLEAN_CHARACTER_DB)) return; - sLog.outString("Cleaning character database..."); + sLog->outString("Cleaning character database..."); uint32 oldMSTime = getMSTime(); @@ -49,8 +49,8 @@ void CharacterDatabaseCleaner::CleanDatabase() CleanCharacterTalent(); CharacterDatabase.Query("UPDATE worldstates SET value = 0 WHERE entry=20004"); - sLog.outString(">> Cleaned character database in %u ms", GetMSTimeDiffToNow(oldMSTime)); - sLog.outString(); + sLog->outString(">> Cleaned character database in %u ms", GetMSTimeDiffToNow(oldMSTime)); + sLog->outString(); } void CharacterDatabaseCleaner::CheckUnique(const char* column, const @@ -59,7 +59,7 @@ char* table, bool (*check)(uint32)) QueryResult result = CharacterDatabase.PQuery("SELECT DISTINCT %s FROM %s", column, table); if(!result) { - sLog.outString( "Table %s is empty.", table ); + sLog->outString( "Table %s is empty.", table ); return; } diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index 30ca207bd4d..821e5e6afe4 100755 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -471,7 +471,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s std::string tn = gettablename(line); if (tn.empty()) { - sLog.outError("LoadPlayerDump: Can't extract table name from line: '%s'!", line.c_str()); + sLog->outError("LoadPlayerDump: Can't extract table name from line: '%s'!", line.c_str()); ROLLBACK(DUMP_FILE_BROKEN); } @@ -488,7 +488,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s if (i == DUMP_TABLE_COUNT) { - sLog.outError("LoadPlayerDump: Unknown table: '%s'!", tn.c_str()); + sLog->outError("LoadPlayerDump: Unknown table: '%s'!", tn.c_str()); ROLLBACK(DUMP_FILE_BROKEN); } @@ -634,7 +634,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s break; } default: - sLog.outError("Unknown dump table type: %u",type); + sLog->outError("Unknown dump table type: %u",type); break; } |
