Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 00:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded SCRIPT_COMMAND_SET_FLAG that already was implemented in a different way.

Browse Source 
(/blame Malcrom)

--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-06-05 17:58:11 +02:00
parent 3fad2782f1
commit d45d61c2b1
2 changed files with 9 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/game/Map.cpp
View File

@@ -3023,11 +3023,10 @@ void Map::ScriptsProcess()
break;
}
// 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);
sLog.outError("SCRIPT_COMMAND_FIELD_SET (script id: %u) call for non-creature source.", step.script->id);
break;
}
@@ -3062,12 +3061,15 @@ void Map::ScriptsProcess()
cSource->GetMap()->CreatureRelocation(cSource, step.script->x, step.script->y, step.script->z, 0);
break;
}
case SCRIPT_COMMAND_FLAG_SET:
{
if (!source)
{
sLog.outError("SCRIPT_COMMAND_FLAG_SET (script id: %u) call for NULL object.", step.script->id);
break;
}
if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= source->GetValuesCount())
{
sLog.outError("SCRIPT_COMMAND_FLAG_SET (script id: %u) call for wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u).",
@@ -3077,7 +3079,10 @@ void Map::ScriptsProcess()
source->SetFlag(step.script->datalong, step.script->datalong2);
break;
}
case SCRIPT_COMMAND_FLAG_REMOVE:
{
if (!source)
{
sLog.outError("SCRIPT_COMMAND_FLAG_REMOVE (script id: %u) call for NULL object.", step.script->id);
@@ -3092,7 +3097,8 @@ void Map::ScriptsProcess()
source->RemoveFlag(step.script->datalong, step.script->datalong2);
break;
}
case SCRIPT_COMMAND_TELEPORT_TO:
{
// accept object in any one from target/source arg
@@ -3851,45 +3857,6 @@ void Map::ScriptsProcess()
break;
}
case SCRIPT_COMMAND_SET_FLAG:
{
if (!source)
{
sLog.outError("SCRIPT_COMMAND_MOD_UPDATEFIELD (script id: %u) call for NULL source.", step.script->id);
break;
}
uint16 maxOffset = 0;
switch (source->GetTypeId())
{
case TYPEID_ITEM:
maxOffset = ITEM_END;
break;
case TYPEID_UNIT:
maxOffset = UNIT_END;
break;
case TYPEID_PLAYER:
maxOffset = PLAYER_END;
break;
case TYPEID_GAMEOBJECT:
maxOffset = GAMEOBJECT_END;
break;
}
if (step.script->datalong >= maxOffset || !step.script->datalong)
{
sLog.outError("SCRIPT_COMMAND_MOD_UPDATEFIELD (script id: %u). invalid index parameter (%u). maximum offset: (%u) for typeid %u",
step.script->id, step.script->datalong, maxOffset, source->GetTypeId());
break;
}
if (step.script->dataint)
source->SetFlag(step.script->datalong, step.script->datalong2);
else
source->RemoveFlag(step.script->datalong, step.script->datalong2);
break;
}
default:
sLog.outError("Unknown script command %u called.", step.script->command);
break;

1
src/game/World.h
View File

@@ -454,7 +454,6 @@ enum WorldStates
#define SCRIPT_COMMAND_MODEL 32 // datalong = model id
#define SCRIPT_COMMAND_CLOSE_GOSSIP 33 // close gossip window -- no values
#define SCRIPT_COMMAND_PLAYMOVIE 34 // datalong = movie id
#define SCRIPT_COMMAND_SET_FLAG 35 // dataint: 1=apply,0=remove, datalong = index, datalong2 = newvalue
/// Storage class for commands issued for delayed execution
struct CliCommandHolder