diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-20 17:39:13 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-20 17:39:13 +0100 |
| commit | 8658b5338c905c79daf50cb56dbe739f82d25acc (patch) | |
| tree | ebb2c18b6d9618ac9fef1d2c5f8b335f34d3702c /src/server/game/Reputation/ReputationMgr.cpp | |
| parent | 59fd1a164fc38ddd282707b3221dcd64af284166 (diff) | |
| parent | 9ac96fd702d8ed23491d13eda2238312120cf52f (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
Conflicts:
src/server/collision/Management/MMapManager.cpp
src/server/game/Maps/Map.cpp
src/server/game/Movement/PathGenerator.cpp
Diffstat (limited to 'src/server/game/Reputation/ReputationMgr.cpp')
| -rw-r--r-- | src/server/game/Reputation/ReputationMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index 9c996a9c386..272e1bd7a1e 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -46,7 +46,7 @@ bool ReputationMgr::IsAtWar(uint32 faction_id) const if (!factionEntry) { - TC_LOG_ERROR(LOG_FILTER_GENERAL, "ReputationMgr::IsAtWar: Can't get AtWar flag of %s for unknown faction (faction id) #%u.", _player->GetName().c_str(), faction_id); + TC_LOG_ERROR("misc", "ReputationMgr::IsAtWar: Can't get AtWar flag of %s for unknown faction (faction id) #%u.", _player->GetName().c_str(), faction_id); return 0; } @@ -69,7 +69,7 @@ int32 ReputationMgr::GetReputation(uint32 faction_id) const if (!factionEntry) { - TC_LOG_ERROR(LOG_FILTER_GENERAL, "ReputationMgr::GetReputation: Can't get reputation of %s for unknown faction (faction id) #%u.", _player->GetName().c_str(), faction_id); + TC_LOG_ERROR("misc", "ReputationMgr::GetReputation: Can't get reputation of %s for unknown faction (faction id) #%u.", _player->GetName().c_str(), faction_id); return 0; } |