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/game/Tools/CharacterDatabaseCleaner.cpp
+5 -5
View File
@@ -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;
}
src/server/game/Tools/PlayerDump.cpp
+3 -3
View File
@@ -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;
}