aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Conditions/ConditionMgr.cpp
diff options
context:
space:
mode:
authorXTZGZoReX <none@none>2010-08-06 16:33:31 +0200
committerXTZGZoReX <none@none>2010-08-06 16:33:31 +0200
commite4cab07f32c22fc0ffe8853608d26d15ffc73956 (patch)
treeb31155220143079bf58437ed9fd6a4f8ed52c906 /src/server/game/Conditions/ConditionMgr.cpp
parentfd34134a455314dcd404fd928453b816554bfb3f (diff)
* Add ScriptName to conditions.
--HG-- branch : trunk
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
-rw-r--r--src/server/game/Conditions/ConditionMgr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index c835b4e8963..2ce666bede5 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -313,7 +313,7 @@ void ConditionMgr::LoadConditions(bool isReload)
}
uint32 count = 0;
- QueryResult_AutoPtr result = WorldDatabase.Query("SELECT SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference, ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId FROM conditions");
+ QueryResult_AutoPtr result = WorldDatabase.Query("SELECT SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference, ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName FROM conditions");
if (!result)
{
@@ -344,6 +344,7 @@ void ConditionMgr::LoadConditions(bool isReload)
cond->mConditionValue2 = fields[6].GetUInt32();
cond->mConditionValue3 = fields[7].GetUInt32();
cond->ErrorTextd = fields[8].GetUInt32();
+ cond->mScriptId = objmgr.GetScriptId(fields[9].GetString());
if (iConditionTypeOrReference >= 0)
cond->mConditionType = ConditionType(iConditionTypeOrReference);