diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2014-11-21 01:36:50 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2014-11-21 01:36:50 +0100 |
| commit | eeef284a530b35eaf08855065b07afa9f2d84c0c (patch) | |
| tree | 62a988b98660090a25a8103afb15fa39399df529 | |
| parent | c7a0cc02f6ff9f06f3dc5c4486b3e996213b5170 (diff) | |
Resolve merge conflict
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/Instances/InstanceScript.cpp | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 120cb8d88f5..b8ff56f94ca 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -2016,8 +2016,6 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) TC_LOG_ERROR("sql.sql", "%s has invalid ComparisionType (%u), skipped.", cond->ToString(true).c_str(), cond->ConditionValue2); return false; } - if (cond->ConditionValue3) - TC_LOG_ERROR("sql.sql", "%s has useless data in value3 (%u)!", cond->ToString(true).c_str(), cond->ConditionValue3); break; } case CONDITION_HP_PCT: @@ -2032,8 +2030,6 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) TC_LOG_ERROR("sql.sql", "%s has invalid ComparisionType (%u), skipped.", cond->ToString(true).c_str(), cond->ConditionValue2); return false; } - if (cond->ConditionValue3) - TC_LOG_ERROR("sql.sql", "%s has useless data in value3 (%u)!", cond->ToString().c_str(), cond->ConditionValue3); break; } case CONDITION_WORLD_STATE: @@ -2093,7 +2089,6 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) } case CONDITION_INSTANCE_INFO: case CONDITION_AREAID: - case CONDITION_PHASEMASK: case CONDITION_ALIVE: break; default: diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index a8255d62777..1c968a495e9 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -128,7 +128,7 @@ void InstanceScript::LoadObjectData(ObjectData const* creatureData, ObjectData c if (gameObjectData) LoadObjectData(gameObjectData, _gameObjectInfo); - TC_LOG_ERROR("scripts", "InstanceScript::LoadObjectData: " SZFMTD " objects loaded.", _creatureInfo.size() + _gameObjectInfo.size()); + TC_LOG_DEBUG("scripts", "InstanceScript::LoadObjectData: " SZFMTD " objects loaded.", _creatureInfo.size() + _gameObjectInfo.size()); } void InstanceScript::LoadObjectData(ObjectData const* data, ObjectInfoMap& objectInfo) |