Sanity commit: replace deinit with shutdown

9 files changed, 14 insertions, 14 deletions

diff --git a/src/game/server/game.cc b/src/game/server/game.cc
index 978474c..cdf1459 100644
--- a/src/game/server/game.cc
+++ b/src/game/server/game.cc
@@ -94,21 +94,21 @@ void server_game::init_late(void)
     sessions::init_post_universe();
 }
 
-void server_game::deinit(void)
+void server_game::shutdown(void)
 {
     protocol::Disconnect packet;
     packet.reason = "protocol.server_shutdown";
     protocol::broadcast(globals::server_host, protocol::encode(packet));
 
-    whitelist::deinit();
+    whitelist::shutdown();
 
-    sessions::deinit();
+    sessions::shutdown();
 
     enet_host_flush(globals::server_host);
     enet_host_service(globals::server_host, nullptr, 500);
     enet_host_destroy(globals::server_host);
 
-    universe::deinit();
+    universe::shutdown();
 }
 
 void server_game::fixed_update(void)
diff --git a/src/game/server/game.hh b/src/game/server/game.hh
index a770189..9ff21d9 100644
--- a/src/game/server/game.hh
+++ b/src/game/server/game.hh
@@ -18,7 +18,7 @@ namespace server_game
 {
 void init(void);
 void init_late(void);
-void deinit(void);
+void shutdown(void);
 void fixed_update(void);
 void fixed_update_late(void);
 } // namespace server_game
diff --git a/src/game/server/main.cc b/src/game/server/main.cc
index 734ae6a..535982a 100644
--- a/src/game/server/main.cc
+++ b/src/game/server/main.cc
@@ -84,12 +84,12 @@ int main(int argc, char** argv)
         threading::update();
     }
 
-    server_game::deinit();
+    server_game::shutdown();
 
     resource::hard_cleanup<BinFile>();
     resource::hard_cleanup<Image>();
 
-    threading::deinit();
+    threading::shutdown();
 
     spdlog::info("server: shutdown after {} frames", globals::fixed_framecount);
     spdlog::info("server: average framerate: {:.03f} TPS", 1.0f / globals::fixed_frametime_avg);
@@ -97,7 +97,7 @@ int main(int argc, char** argv)
 
     globals::server_config.save_file("server.conf");
 
-    shared_game::deinit();
+    shared_game::shutdown();
 
     return EXIT_SUCCESS;
 }
diff --git a/src/game/server/sessions.cc b/src/game/server/sessions.cc
index 43abbb7..3024939 100644
--- a/src/game/server/sessions.cc
+++ b/src/game/server/sessions.cc
@@ -285,7 +285,7 @@ void sessions::init_post_universe(void)
     }
 }
 
-void sessions::deinit(void)
+void sessions::shutdown(void)
 {
     username_map.clear();
     identity_map.clear();
diff --git a/src/game/server/sessions.hh b/src/game/server/sessions.hh
index 7c9d13e..2eee256 100644
--- a/src/game/server/sessions.hh
+++ b/src/game/server/sessions.hh
@@ -26,7 +26,7 @@ namespace sessions
 void init(void);
 void init_late(void);
 void init_post_universe(void);
-void deinit(void);
+void shutdown(void);
 } // namespace sessions
 
 namespace sessions
diff --git a/src/game/server/universe.cc b/src/game/server/universe.cc
index 96884cf..91d8469 100644
--- a/src/game/server/universe.cc
+++ b/src/game/server/universe.cc
@@ -128,7 +128,7 @@ void universe::init_late(void)
     globals::spawn_dimension = spawn_dimension->second;
 }
 
-void universe::deinit(void)
+void universe::shutdown(void)
 {
     for(const auto metadata : metadata_map) {
         metadata.second->config.save_file(metadata.second->config_path.c_str());
diff --git a/src/game/server/universe.hh b/src/game/server/universe.hh
index 132d8a1..0313437 100644
--- a/src/game/server/universe.hh
+++ b/src/game/server/universe.hh
@@ -12,7 +12,7 @@ namespace universe
 {
 void init(void);
 void init_late(void);
-void deinit(void);
+void shutdown(void);
 } // namespace universe
 
 namespace universe
diff --git a/src/game/server/whitelist.cc b/src/game/server/whitelist.cc
index 6635122..69ac5a8 100644
--- a/src/game/server/whitelist.cc
+++ b/src/game/server/whitelist.cc
@@ -72,7 +72,7 @@ void whitelist::init_late(void)
     PHYSFS_close(file);
 }
 
-void whitelist::deinit(void)
+void whitelist::shutdown(void)
 {
     // UNDONE: implement saving
 }
diff --git a/src/game/server/whitelist.hh b/src/game/server/whitelist.hh
index e754a02..b9008aa 100644
--- a/src/game/server/whitelist.hh
+++ b/src/game/server/whitelist.hh
@@ -15,7 +15,7 @@ namespace whitelist
 {
 void init(void);
 void init_late(void);
-void deinit(void);
+void shutdown(void);
 } // namespace whitelist
 
 namespace whitelist