diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-12-30 16:43:30 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-12-30 20:22:58 -0500 |
| commit | c0913f09f4ca6ffd617c00a77e5d5f4d96426e56 (patch) | |
| tree | d44232818c8b00cf7eaabc1f5c5ef059707cf77e /src | |
| parent | 82f3b24e8a3f2b86f09bcf7d06bffbecaef0bc6f (diff) | |
Core/Conditions: Fixed build from previous merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Instances/InstanceScript.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/PhaseMgr.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index a183c13d2c7..08515140ee7 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -457,7 +457,7 @@ void InstanceScript::UpdateEncounterState(EncounterCreditType type, uint32 credi void InstanceScript::UpdatePhasing() { PhaseUpdateData phaseUdateData; - phaseUdateData.AddConditionType(CONDITION_INSTANCE_DATA); + phaseUdateData.AddConditionType(CONDITION_INSTANCE_INFO); Map::PlayerList const& players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) diff --git a/src/server/game/Maps/PhaseMgr.cpp b/src/server/game/Maps/PhaseMgr.cpp index d43a930c71d..9949ee5bdd4 100644 --- a/src/server/game/Maps/PhaseMgr.cpp +++ b/src/server/game/Maps/PhaseMgr.cpp @@ -365,7 +365,7 @@ bool PhaseMgr::IsConditionTypeSupported(ConditionTypes const conditionType) case CONDITION_TEAM: case CONDITION_CLASS: case CONDITION_RACE: - case CONDITION_INSTANCE_DATA: + case CONDITION_INSTANCE_INFO: case CONDITION_LEVEL: return true; default: |