As requested by vlj, move singleton from networking to utils

src/network/network_interface.hpp

@@ -23,9 +23,9 @@
 #ifndef NETWORK_INTERFACE_H
 #define NETWORK_INTERFACE_H
 
-#include "network/singleton.hpp"
 #include "network/types.hpp"
 #include "network/network_manager.hpp"
+#include "utils/singleton.hpp"
 
 #include <pthread.h>
 #include <string>

src/network/network_manager.hpp

@@ -27,10 +27,10 @@
 #include "network/stk_host.hpp"
 
 #include "network/protocol_manager.hpp"
-#include "network/singleton.hpp"
 #include "network/types.hpp"
 #include "network/event.hpp"
 #include "network/game_setup.hpp"
+#include "utils/singleton.hpp"
 
 #include <vector>
 

src/network/network_world.hpp

@@ -22,8 +22,8 @@
 #ifndef NETWORK_WORLD_HPP
 #define NETWORK_WORLD_HPP
 
-#include "network/singleton.hpp"
 #include "input/input.hpp"
+#include "utils/singleton.hpp"
 #include <map>
 
 class Controller;

src/network/protocol_manager.hpp

@@ -23,10 +23,10 @@
 #ifndef PROTOCOL_MANAGER_HPP
 #define PROTOCOL_MANAGER_HPP
 
-#include "network/singleton.hpp"
 #include "network/event.hpp"
 #include "network/network_string.hpp"
 #include "network/protocol.hpp"
+#include "utils/singleton.hpp"
 #include "utils/types.hpp"
 
 #include <vector>

src/utils/singleton.hpp

@@ -72,6 +72,7 @@ class Singleton
             if (m_singleton)
             {
                 delete m_singleton;
+                m_singleton = NULL;
             }
         }