aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Taxi
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-03-11 17:11:05 +0100
committerNaios <naios-dev@live.de>2016-03-11 18:35:49 +0100
commit329225b40d110bed634f8cd0a1ab5c6dc7bbbdd1 (patch)
tree5cf3f149429e6821660cdc9c04ef3210ac374e4b /src/server/game/Entities/Taxi
parenta8fe7f6eb7195368bbb4d0256927405f5e5c6f87 (diff)
Core/Game: Move singleton instances into compilation units
* Fixes issues when building shared libraries (prevents gcc and clang from providing several instance)
Diffstat (limited to 'src/server/game/Entities/Taxi')
-rw-r--r--src/server/game/Entities/Taxi/TaxiPathGraph.cpp6
-rw-r--r--src/server/game/Entities/Taxi/TaxiPathGraph.h6
2 files changed, 7 insertions, 5 deletions
diff --git a/src/server/game/Entities/Taxi/TaxiPathGraph.cpp b/src/server/game/Entities/Taxi/TaxiPathGraph.cpp
index 5fe2db46fa5..6617267be6a 100644
--- a/src/server/game/Entities/Taxi/TaxiPathGraph.cpp
+++ b/src/server/game/Entities/Taxi/TaxiPathGraph.cpp
@@ -25,6 +25,12 @@
#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/property_map/transform_value_property_map.hpp>
+TaxiPathGraph& TaxiPathGraph::Instance()
+{
+ static TaxiPathGraph instance;
+ return instance;
+}
+
void TaxiPathGraph::Initialize()
{
if (GetVertexCount() > 0)
diff --git a/src/server/game/Entities/Taxi/TaxiPathGraph.h b/src/server/game/Entities/Taxi/TaxiPathGraph.h
index 0da1090ef8f..434440acaef 100644
--- a/src/server/game/Entities/Taxi/TaxiPathGraph.h
+++ b/src/server/game/Entities/Taxi/TaxiPathGraph.h
@@ -28,11 +28,7 @@ struct TaxiNodesEntry;
class TaxiPathGraph
{
public:
- static TaxiPathGraph& Instance()
- {
- static TaxiPathGraph instance;
- return instance;
- }
+ static TaxiPathGraph& Instance();
void Initialize();
std::size_t GetCompleteNodeRoute(TaxiNodesEntry const* from, TaxiNodesEntry const* to, Player const* player, std::vector<uint32>& shortestPath);