Place Networking after event things in Director

It uses the event bus, so correct order of destruction must be ensured.

diff --git a/source/game/director.cpp b/source/game/director.cpp
index ef906c3c224744e2e104706a7baf08b48e653b18..d42daa890809cf7019ff65eee4fefffdabdb7e31 100644 (file)
--- a/source/game/director.cpp
+++ b/source/game/director.cpp
@@ -12,8 +12,8 @@ namespace Msp::Game {
 
 Director::Director(DataFile::Collection &r):
        resources(r),
-       networking(*this),
-       event_source(event_bus)
+       event_source(event_bus),
+       networking(*this)
 {
 #if DEBUG
        access_guard.emplace();

diff --git a/source/game/director.h b/source/game/director.h
index dc6e483a1cb01e011f49ff945aca928fa5415b2f..80377883bf947b5be851704d929b459e0cdf6e7a 100644 (file)
--- a/source/game/director.h
+++ b/source/game/director.h
@@ -30,9 +30,9 @@ private:
        Reflection::Reflector reflector;
        DataFile::Collection &resources;
        IO::EventDispatcher io_dispatcher;
-       Networking networking;
        EventBus event_bus;
        EventSource event_source;
+       Networking networking;
        std::vector<std::unique_ptr<Stage>> stages;
        Stage *active_stage = nullptr;
        Time::TimeStamp last_tick;