Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SCRIPT_COMMAND_FIELD_SET, it will no longer throw error that the specified parameter was an invalid field. In addition, the command is now usable from gossip scripts.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-06-05 17:48:56 +02:00
parent 8aed083782
commit bb292845ed
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/game/Map.cpp
View File

@@ -3016,20 +3016,32 @@ void Map::ScriptsProcess()
}
case SCRIPT_COMMAND_FIELD_SET:
{
if (!source)
{
sLog.outError("SCRIPT_COMMAND_FIELD_SET (script id: %u) call for NULL object.", step.script->id);
sLog.outError("SCRIPT_COMMAND_FIELD_SET (script id: %u) call for NULL source.", step.script->id);
break;
}
if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= source->GetValuesCount())
// Source should only be Creature or GO, but in case of gossip, the target is our source.
Creature* cSource = source->ToCreature() != NULL ? source->ToCreature() : target->ToCreature();
if (!cSource)
{
sLog.outError("SCRIPT_COMMAND_FIELD_SET (script id: %u) call for non-creature or non-GO source.", step.script->id);
break;
}
if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= cSource->GetValuesCount())
{
sLog.outError("SCRIPT_COMMAND_FIELD_SET (script id: %u) call for wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u).",
step.script->id, step.script->datalong,source->GetValuesCount(),source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
break;
}
source->SetUInt32Value(step.script->datalong, step.script->datalong2);
cSource->SetUInt32Value(step.script->datalong, step.script->datalong2);
break;
}
case SCRIPT_COMMAND_MOVE_TO:
{
if (!source)