diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2018-01-06 19:56:11 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2018-01-06 19:56:11 +0100 |
| commit | 5e3e4182c892413d02efc78af9f231dcb1a05c79 (patch) | |
| tree | 3046ec110dc88e4972f21d5312473d846909d572 /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | 769db08a67db67e2dca7910c23277fa94d98fe7f (diff) | |
Core/Entities: Extended SpawnMask to 64 bit
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 10527cc2568..8ff968d697b 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -424,7 +424,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const } case CONDITION_SPAWNMASK: { - condMeets = ((1 << object->GetMap()->GetSpawnMode()) & ConditionValue1) != 0; + condMeets = ((UI64LIT(1) << object->GetMap()->GetSpawnMode()) & ConditionValue1) != 0; break; } case CONDITION_UNIT_STATE: @@ -2260,7 +2260,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const } case CONDITION_SPAWNMASK: { - if (cond->ConditionValue1 > SPAWNMASK_RAID_ALL) + if (cond->ConditionValue1 >= (UI64LIT(1) << MAX_DIFFICULTY)) { TC_LOG_ERROR("sql.sql", "%s has non existing SpawnMask in value1 (%u), skipped.", cond->ToString(true).c_str(), cond->ConditionValue1); return false; |