diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-22 15:31:21 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-22 15:31:21 +0200 |
| commit | f2dff3da38be4dffca204013e917579a1116a817 (patch) | |
| tree | 94e0958c862f9d8ba09dcaca39127a2459283b67 /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | fb997c5f41965eafb080597a71181fcfc57e7678 (diff) | |
| parent | 56b3e52f067f5f5d671559e6f8ce28506afce635 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 60bbda1a2fb..34c6b63444f 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1799,7 +1799,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) { if (cond->ConditionValue2 >= COMP_TYPE_MAX) { - TC_LOG_ERROR(LOG_FILTER_SQL, "Level condition has invalid option (%u), skipped", cond->ConditionValue2); + TC_LOG_ERROR(LOG_FILTER_SQL, "Level condition has invalid ComparisionType (%u), skipped", cond->ConditionValue2); return false; } if (cond->ConditionValue3) |