josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Add ScriptName to conditions.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2010-08-06 16:33:31 +02:00
parent fd34134a45
commit e4cab07f32
5 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Conditions/ConditionMgr.cpp
+2 -1
View File
@@ -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);
src/server/game/Conditions/ConditionMgr.h
+2
View File
@@ -95,6 +95,7 @@ struct Condition
uint32 mConditionValue3;
uint32 ErrorTextd;
uint32 mReferenceId;
uint32 mScriptId;
Condition()
{
@@ -108,6 +109,7 @@ struct Condition
mConditionValue3 = 0;
mReferenceId = 0;
ErrorTextd = 0;
mScriptId = 0;
}
bool Meets(Player * player, Unit* targetOverride = NULL);
bool isLoaded() { return mConditionType > CONDITION_NONE || mReferenceId; }
src/server/game/Globals/ObjectMgr.cpp
+2
View File
@@ -8748,6 +8748,8 @@ void ObjectMgr::LoadScriptNames()
"UNION "
"SELECT DISTINCT(ScriptName) FROM game_weather WHERE ScriptName <> '' "
"UNION "
"SELECT DISTINCT(ScriptName) FROM conditions WHERE ScriptName <> '' "
"UNION "
"SELECT DISTINCT(script) FROM instance_template WHERE script <> ''");
if (!result)