Minor correction to a7fc2586e7 - load columns from db in the same order they're stored.

This commit is contained in:
QAston
2012-02-10 12:54:34 +01:00
parent 5684f39d58
commit e0ad0f0e8d
2 changed files with 5 additions and 5 deletions
+4 -4
View File
@@ -394,7 +394,7 @@ void ConditionMgr::LoadConditions(bool isReload)
}
QueryResult result = WorldDatabase.Query("SELECT SourceTypeOrReferenceId, SourceGroup, SourceEntry, SourceId, ElseGroup, ConditionTypeOrReference, "
" ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName, NegateCondition FROM conditions");
" ConditionValue1, ConditionValue2, ConditionValue3, NegativeCondition, ErrorTextId, ScriptName FROM conditions");
if (!result)
{
@@ -420,9 +420,9 @@ void ConditionMgr::LoadConditions(bool isReload)
cond->mConditionValue1 = fields[6].GetUInt32();
cond->mConditionValue2 = fields[7].GetUInt32();
cond->mConditionValue3 = fields[8].GetUInt32();
cond->ErrorTextd = fields[9].GetUInt32();
cond->mScriptId = sObjectMgr->GetScriptId(fields[10].GetCString());
cond->mNegativeCondition = fields[11].GetUInt8();
cond->mNegativeCondition = fields[9].GetUInt8();
cond->ErrorTextd = fields[10].GetUInt32();
cond->mScriptId = sObjectMgr->GetScriptId(fields[11].GetCString());
if (iConditionTypeOrReference >= 0)
cond->mConditionType = ConditionType(iConditionTypeOrReference);