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

Core/Entities: Updated HighGuid values

Browse Source
This commit is contained in:
Shauren
2014-10-27 12:03:35 +01:00
parent 8b75b7e638
commit 7afab9f783
65 changed files with 407 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/server/game/Scripting/MapScripts.cpp
View File

@@ -315,28 +315,27 @@ void Map::ScriptsProcess()
{
switch (step.sourceGUID.GetHigh())
{
case HIGHGUID_ITEM: // as well as HIGHGUID_CONTAINER
case HighGuid::Item: // as well as HIGHGUID_CONTAINER
if (Player* player = HashMapHolder<Player>::Find(step.ownerGUID))
source = player->GetItemByGuid(step.sourceGUID);
break;
case HIGHGUID_UNIT:
case HIGHGUID_VEHICLE:
case HighGuid::Creature:
case HighGuid::Vehicle:
source = HashMapHolder<Creature>::Find(step.sourceGUID);
break;
case HIGHGUID_PET:
case HighGuid::Pet:
source = HashMapHolder<Pet>::Find(step.sourceGUID);
break;
case HIGHGUID_PLAYER:
case HighGuid::Player:
source = HashMapHolder<Player>::Find(step.sourceGUID);
break;
case HIGHGUID_TRANSPORT:
case HIGHGUID_GAMEOBJECT:
case HighGuid::GameObject:
source = HashMapHolder<GameObject>::Find(step.sourceGUID);
break;
case HIGHGUID_CORPSE:
case HighGuid::Corpse:
source = HashMapHolder<Corpse>::Find(step.sourceGUID);
break;
case HIGHGUID_MO_TRANSPORT:
case HighGuid::Transport:
{
GameObject* go = HashMapHolder<GameObject>::Find(step.sourceGUID);
source = go ? go->ToTransport() : NULL;
@@ -354,24 +353,23 @@ void Map::ScriptsProcess()
{
switch (step.targetGUID.GetHigh())
{
case HIGHGUID_UNIT:
case HIGHGUID_VEHICLE:
case HighGuid::Creature:
case HighGuid::Vehicle:
target = HashMapHolder<Creature>::Find(step.targetGUID);
break;
case HIGHGUID_PET:
case HighGuid::Pet:
target = HashMapHolder<Pet>::Find(step.targetGUID);
break;
case HIGHGUID_PLAYER: // empty GUID case also
case HighGuid::Player:
target = HashMapHolder<Player>::Find(step.targetGUID);
break;
case HIGHGUID_TRANSPORT:
case HIGHGUID_GAMEOBJECT:
case HighGuid::GameObject:
target = HashMapHolder<GameObject>::Find(step.targetGUID);
break;
case HIGHGUID_CORPSE:
case HighGuid::Corpse:
target = HashMapHolder<Corpse>::Find(step.targetGUID);
break;
case HIGHGUID_MO_TRANSPORT:
case HighGuid::Transport:
{
GameObject* go = HashMapHolder<GameObject>::Find(step.targetGUID);
target = go ? go->ToTransport() : NULL;
@@ -829,7 +827,7 @@ void Map::ScriptsProcess()
else //check hashmap holders
{
if (CreatureData const* data = sObjectMgr->GetCreatureData(step.script->CallScript.CreatureEntry))
cTarget = ObjectAccessor::GetObjectInWorld<Creature>(data->mapid, data->posX, data->posY, ObjectGuid(HIGHGUID_UNIT, data->id, uint64(step.script->CallScript.CreatureEntry)), cTarget);
cTarget = ObjectAccessor::GetObjectInWorld<Creature>(data->mapid, data->posX, data->posY, ObjectGuid(HighGuid::Creature, data->id, uint64(step.script->CallScript.CreatureEntry)), cTarget);
}
if (!cTarget)