From 94773a1ab550b35d29d806865cc177bf9cd5aaf8 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 7 Nov 2016 00:08:49 +0100 Subject: Dynamic linking build fix --- src/server/game/Scenarios/ScenarioMgr.cpp | 10 +++++++++- src/server/game/Scenarios/ScenarioMgr.h | 16 ++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/server/game/Scenarios/ScenarioMgr.cpp b/src/server/game/Scenarios/ScenarioMgr.cpp index cecf9d6caf0..9786e3080a7 100644 --- a/src/server/game/Scenarios/ScenarioMgr.cpp +++ b/src/server/game/Scenarios/ScenarioMgr.cpp @@ -28,7 +28,7 @@ ScenarioMgr* ScenarioMgr::Instance() return &instance; } -InstanceScenario* ScenarioMgr::CreateInstanceScenario(Map* map, TeamId team) +InstanceScenario* ScenarioMgr::CreateInstanceScenario(Map const* map, TeamId team) const { auto dbDataItr = _scenarioDBData.find(std::make_pair(map->GetId(), map->GetDifficultyID())); // No scenario registered for this map and difficulty in the database @@ -212,3 +212,11 @@ void ScenarioMgr::LoadScenarioPOI() TC_LOG_INFO("server.loading", ">> Loaded %u scenario POI definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); } +ScenarioPOIVector const* ScenarioMgr::GetScenarioPOIs(int32 criteriaTreeID) const +{ + auto itr = _scenarioPOIStore.find(criteriaTreeID); + if (itr != _scenarioPOIStore.end()) + return &itr->second; + + return nullptr; +} diff --git a/src/server/game/Scenarios/ScenarioMgr.h b/src/server/game/Scenarios/ScenarioMgr.h index 00c04ac1e4c..cd6e98d3651 100644 --- a/src/server/game/Scenarios/ScenarioMgr.h +++ b/src/server/game/Scenarios/ScenarioMgr.h @@ -105,25 +105,21 @@ private: public: static ScenarioMgr* Instance(); + InstanceScenario* CreateInstanceScenario(Map const* map, TeamId team) const; + void LoadDBData(); void LoadDB2Data(); void LoadScenarioPOI(); - ScenarioPOIVector const* GetScenarioPOIs(int32 CriteriaTreeID) - { - auto itr = _scenarioPOIStore.find(CriteriaTreeID); - if (itr != _scenarioPOIStore.end()) - return &itr->second; - - return nullptr; - } - - InstanceScenario* CreateInstanceScenario(Map* map, TeamId team); + ScenarioPOIVector const* GetScenarioPOIs(int32 criteriaTreeID) const; private: ScenarioDataContainer _scenarioData; ScenarioPOIContainer _scenarioPOIStore; ScenarioDBDataContainer _scenarioDBData; + + ScenarioMgr(ScenarioMgr const&) = delete; + ScenarioMgr& operator=(ScenarioMgr const&) = delete; }; #define sScenarioMgr ScenarioMgr::Instance() -- cgit v1.2.3