Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3114 from megamage/master

Browse Source 
Fix crash caused by invalid talker in SmartScript. Closes #3082.
This commit is contained in:
Shauren
2011-09-19 09:12:46 -07:00
parent a11bee31c3 c9a4efdf8f
commit d7f9aafe9f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/game/AI/SmartScripts/SmartScript.cpp
View File

@@ -46,7 +46,7 @@ SmartScript::SmartScript()
mLastTextID = 0;
mTextGUID = 0;
mUseTextTimer = false;
talker = NULL;
mTalkerEntry = 0;
mTemplate = SMARTAI_TEMPLATE_BASIC;
meOrigGUID = 0;
goOrigGUID = 0;
@@ -138,7 +138,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
return;
ObjectList* targets = GetTargets(e, unit);
talker = me;
Creature* talker = me;
if (targets)
{
for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
@@ -153,6 +153,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
delete targets;
}
mTalkerEntry = talker->GetEntry();
mLastTextID = e.action.talk.textGroupID;
mTextTimer = e.action.talk.duration;
mTextGUID = IsPlayer(GetLastInvoker()) ? GetLastInvoker()->GetGUID() : 0;//invoker, used for $vars in texts
@@ -2705,13 +2706,13 @@ void SmartScript::OnUpdate(uint32 const diff)
{
if (mTextTimer < diff)
{
uint32 temp = mLastTextID;
uint32 textID = mLastTextID;
mLastTextID = 0;
uint32 entry = mTalkerEntry;
mTalkerEntry = 0;
mTextTimer = 0;
mUseTextTimer = false;
uint32 tempEntry = talker?talker->GetEntry():0;
talker = NULL;
ProcessEventsFor(SMART_EVENT_TEXT_OVER, NULL, temp, tempEntry);
ProcessEventsFor(SMART_EVENT_TEXT_OVER, NULL, textID, entry);
} else mTextTimer -= diff;
}
}

2
src/server/game/AI/SmartScripts/SmartScript.h
View File

@@ -248,7 +248,7 @@ class SmartScript
uint32 mTextTimer;
uint32 mLastTextID;
uint64 mTextGUID;
Creature* talker;
uint32 mTalkerEntry;
bool mUseTextTimer;
SMARTAI_TEMPLATE mTemplate;