diff options
| author | Rat <gmstreetrat@gmail.com> | 2015-03-29 17:56:20 +0200 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2015-03-29 17:56:20 +0200 |
| commit | 81df6b2ad23d4f405ef088c5405bd079e6570a9d (patch) | |
| tree | 7ec55b811156beca26e87336cd9684ae7d8bee42 /src | |
| parent | 3d84ab74b0fa7bcc8e8b2775e1919c071fa7b6fb (diff) | |
Core/Phases: Defined default phaseID
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index d202665b18f..3fbe9fbf63a 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -3140,10 +3140,10 @@ bool WorldObject::IsInPhase(WorldObject const* obj) const if (_phases.empty() && obj->GetPhases().empty()) return true; - if (_phases.empty() && obj->IsInPhase(169)) + if (_phases.empty() && obj->IsInPhase(DEFAULT_PHASE)) return true; - if (obj->GetPhases().empty() && IsInPhase(169)) + if (obj->GetPhases().empty() && IsInPhase(DEFAULT_PHASE)) return true; if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->IsGameMaster()) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 54fd48fa4b9..ab0c6f0da70 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -46,6 +46,8 @@ #define NOMINAL_MELEE_RANGE 5.0f #define MELEE_RANGE (NOMINAL_MELEE_RANGE - MIN_MELEE_REACH * 2) //center to center for players +#define DEFAULT_PHASE 169 + enum TempSummonType { TEMPSUMMON_TIMED_OR_DEAD_DESPAWN = 1, // despawns after a specified time OR when the creature disappears |