aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Conditions
diff options
context:
space:
mode:
authorQAston <qaston@gmail.com>2012-02-10 12:54:06 +0100
committerQAston <qaston@gmail.com>2012-02-10 12:54:34 +0100
commite0ad0f0e8d391e0f71894c2b49232aa301773058 (patch)
tree22f0ff0b4ba42488e9a793f8e9ab71c1a4052681 /src/server/game/Conditions
parent5684f39d58602f1abf0b718da6cc5fb3f52b9dfe (diff)
Minor correction to a7fc2586e765a39371d49bf3f2b0b81d9c9df69a - load columns from db in the same order they're stored.
Diffstat (limited to 'src/server/game/Conditions')
-rwxr-xr-xsrc/server/game/Conditions/ConditionMgr.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index b05643529ec..964abe6ae57 100755
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -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);