aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Conditions/ConditionMgr.cpp
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2015-03-30 16:08:48 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2015-03-30 16:08:48 +0200
commit355928305a683f7d069f45864eebf9e3c40fbc18 (patch)
tree6e1b7ca5048cf3fb696b44ee4ef4092cd10fa88f /src/server/game/Conditions/ConditionMgr.cpp
parentc791bc04549fe0244bdcf0a37fa5d4ff7a2310de (diff)
Core/Conditions: adjust logging code after recent phases changes
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
-rw-r--r--src/server/game/Conditions/ConditionMgr.cpp16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index c5e3d26b00a..5fc7240cb9c 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -56,7 +56,8 @@ char const* ConditionMgr::StaticSourceTypeData[CONDITION_SOURCE_TYPE_MAX] =
"SmartScript",
"Npc Vendor",
"Spell Proc",
- "Phase Def"
+ "Terrain Swap",
+ "Phase"
};
ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[CONDITION_MAX] =
@@ -99,8 +100,9 @@ ConditionMgr::ConditionTypeInfo const ConditionMgr::StaticConditionTypeData[COND
{ "Distance", true, true, true },
{ "Alive", false, false, false },
{ "Health Value", true, true, false },
- { "Health Pct", true, true, false },
- { "Realm Achievement", true, false, false }
+ { "Health Pct", true, true, false },
+ { "Realm Achievement", true, false, false },
+ { "Terrain Swap", true, false, false }
};
// Checks if object meets the condition
@@ -2065,14 +2067,6 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
}
break;
}
- case CONDITION_TERRAIN_SWAP:
- {
- if (cond->ConditionValue2)
- TC_LOG_ERROR("sql.sql", "Terrain swap condition has useless data in value2 (%u)!", cond->ConditionValue2);
- if (cond->ConditionValue3)
- TC_LOG_ERROR("sql.sql", "Terrain swap condition has useless data in value3 (%u)!", cond->ConditionValue3);
- break;
- }
case CONDITION_TITLE:
{
CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(cond->ConditionValue1);