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

Fix SCRIPT_COMMAND_EMOTE, allow it to be used in gossip scripts where source = player.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-06-04 17:47:22 +02:00
parent 54ee0f6483
commit d3969ff9b3
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Map.cpp
+12 -6
View File
@@ -3067,24 +3067,30 @@ void Map::ScriptsProcess()
}
case SCRIPT_COMMAND_EMOTE:
{
if (!source)
{
sLog.outError("SCRIPT_COMMAND_EMOTE (script id: %u) call for NULL creature.", step.script->id);
sLog.outError("SCRIPT_COMMAND_EMOTE (script id: %u) call for NULL source.", step.script->id);
break;
}
if (source->GetTypeId() != TYPEID_UNIT)
Creature* cSource = NULL;
cSource = source->ToCreature() != NULL ? source->ToCreature() : target->ToCreature();
if (!cSource)
{
sLog.outError("SCRIPT_COMMAND_EMOTE (script id: %u) call for non-creature (TypeId: %u, Entry: %u, GUID: %u), skipping.",
step.script->id, source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
sLog.outError("SCRIPT_COMMAND_TALK (script id: %u) call for non supported source (TypeId: %u, Entry: %u, GUID: %u), skipping.",
step.script->id, source->GetTypeId(), source->GetEntry(), source->GetGUIDLow());
break;
}
if (step.script->datalong2)
source->SetUInt32Value(UNIT_NPC_EMOTESTATE, step.script->datalong);
cSource->SetUInt32Value(UNIT_NPC_EMOTESTATE, step.script->datalong);
else
((Unit*)source)->HandleEmoteCommand(step.script->datalong);
cSource->HandleEmoteCommand(step.script->datalong);
break;
}
case SCRIPT_COMMAND_FIELD_SET:
if (!source)
{