diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-03-12 18:20:26 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-03-12 23:11:49 +0100 |
| commit | 007b5a68c50bbee7d05acec888d3273c2a5a8577 (patch) | |
| tree | 4818b60a73730b98ae4785d0630edbd6cd27d5bf /src/server/game/Scenarios | |
| parent | 50a912af72ca84095eab5effa7d70e8a50ff8a04 (diff) | |
Core/DataStores: Fixed db2 structures after 7.3.5
Diffstat (limited to 'src/server/game/Scenarios')
| -rw-r--r-- | src/server/game/Scenarios/Scenario.cpp | 10 | ||||
| -rw-r--r-- | src/server/game/Scenarios/ScenarioMgr.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Scenarios/Scenario.cpp b/src/server/game/Scenarios/Scenario.cpp index df36fec1cff..1e70b40cf54 100644 --- a/src/server/game/Scenarios/Scenario.cpp +++ b/src/server/game/Scenarios/Scenario.cpp @@ -54,7 +54,7 @@ void Scenario::Reset() void Scenario::CompleteStep(ScenarioStepEntry const* step) { - if (Quest const* quest = sObjectMgr->GetQuestTemplate(step->QuestRewardID)) + if (Quest const* quest = sObjectMgr->GetQuestTemplate(step->RewardQuestID)) for (ObjectGuid guid : _players) if (Player* player = ObjectAccessor::FindPlayer(guid)) player->RewardQuest(quest, 0, nullptr, false); @@ -63,7 +63,7 @@ void Scenario::CompleteStep(ScenarioStepEntry const* step) return; ScenarioStepEntry const* newStep = nullptr; - for (auto _step : _data->Steps) + for (auto const& _step : _data->Steps) { if (_step.second->IsBonusObjective()) continue; @@ -71,7 +71,7 @@ void Scenario::CompleteStep(ScenarioStepEntry const* step) if (GetStepState(_step.second) == SCENARIO_STEP_DONE) continue; - if (!newStep || _step.second->Step < newStep->Step) + if (!newStep || _step.second->OrderIndex < newStep->OrderIndex) newStep = _step.second; } @@ -246,7 +246,7 @@ ScenarioStepEntry const* Scenario::GetFirstStep() const if (scenarioStep.second->IsBonusObjective()) continue; - if (!firstStep || scenarioStep.second->Step < firstStep->Step) + if (!firstStep || scenarioStep.second->OrderIndex < firstStep->OrderIndex) firstStep = scenarioStep.second; } @@ -268,7 +268,7 @@ std::vector<WorldPackets::Scenario::BonusObjectiveData> Scenario::GetBonusObject if (!itr->second->IsBonusObjective()) continue; - if (sCriteriaMgr->GetCriteriaTree(itr->second->CriteriaTreeID)) + if (sCriteriaMgr->GetCriteriaTree(itr->second->Criteriatreeid)) { WorldPackets::Scenario::BonusObjectiveData bonusObjectiveData; bonusObjectiveData.BonusObjectiveID = itr->second->ID; diff --git a/src/server/game/Scenarios/ScenarioMgr.cpp b/src/server/game/Scenarios/ScenarioMgr.cpp index b29101fb556..c70e560efd7 100644 --- a/src/server/game/Scenarios/ScenarioMgr.cpp +++ b/src/server/game/Scenarios/ScenarioMgr.cpp @@ -117,8 +117,8 @@ void ScenarioMgr::LoadDB2Data() for (ScenarioStepEntry const* step : sScenarioStepStore) { - scenarioSteps[step->ScenarioID][step->Step] = step; - if (CriteriaTree const* tree = sCriteriaMgr->GetCriteriaTree(step->CriteriaTreeID)) + scenarioSteps[step->ScenarioID][step->OrderIndex] = step; + if (CriteriaTree const* tree = sCriteriaMgr->GetCriteriaTree(step->Criteriatreeid)) { uint32 criteriaTreeSize = 0; CriteriaMgr::WalkCriteriaTree(tree, [&criteriaTreeSize](CriteriaTree const* /*tree*/) |