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

Core/AreaTrigger: Add object ToAreaTrigger() cast and AreaTrigger typeid/mask to Condition::GetSearcherTypeMaskForCondition

Browse Source
This commit is contained in:
Shocker
2013-05-26 04:56:43 +03:00
parent 1315306cfc
commit cf4e8acf44
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Conditions/ConditionMgr.cpp
View File

@@ -428,6 +428,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition()
case TYPEID_CORPSE:
mask |= GRID_MAP_TYPE_MASK_CORPSE;
break;
case TYPEID_AREATRIGGER:
mask |= GRID_MAP_TYPE_MASK_AREATRIGGER;
break;
default:
break;
}
@@ -441,6 +444,8 @@ uint32 Condition::GetSearcherTypeMaskForCondition()
mask |= GRID_MAP_TYPE_MASK_GAMEOBJECT;
if (ConditionValue1 & TYPEMASK_CORPSE)
mask |= GRID_MAP_TYPE_MASK_CORPSE;
if (ConditionValue1 & TYPEMASK_AREATRIGGER)
mask |= GRID_MAP_TYPE_MASK_AREATRIGGER;
break;
case CONDITION_RELATION_TO:
mask |= GRID_MAP_TYPE_MASK_CREATURE | GRID_MAP_TYPE_MASK_PLAYER;

3
src/server/game/Entities/Object/Object.h
View File

@@ -283,6 +283,9 @@ class Object
DynamicObject* ToDynObject() { if (GetTypeId() == TYPEID_DYNAMICOBJECT) return reinterpret_cast<DynamicObject*>(this); else return NULL; }
DynamicObject const* ToDynObject() const { if (GetTypeId() == TYPEID_DYNAMICOBJECT) return reinterpret_cast<DynamicObject const*>(this); else return NULL; }
AreaTrigger* ToAreaTrigger() { if (GetTypeId() == TYPEID_AREATRIGGER) return reinterpret_cast<AreaTrigger*>(this); else return NULL; }
AreaTrigger const* ToAreaTrigger() const { if (GetTypeId() == TYPEID_AREATRIGGER) return reinterpret_cast<AreaTrigger const*>(this); else return NULL; }
protected:
Object();