diff options
Diffstat (limited to 'src/game')
46 files changed, 67 insertions, 67 deletions
diff --git a/src/game/client/background.cc b/src/game/client/background.cc index 415b63c..d104d7a 100644 --- a/src/game/client/background.cc +++ b/src/game/client/background.cc @@ -20,7 +20,7 @@ void background::init(void) } } -void background::deinit(void) +void background::shutdown(void) { texture = nullptr; } diff --git a/src/game/client/background.hh b/src/game/client/background.hh index 3f06175..f6a68bb 100644 --- a/src/game/client/background.hh +++ b/src/game/client/background.hh @@ -5,7 +5,7 @@ namespace background { void init(void); -void deinit(void); +void shutdown(void); void layout(void); } // namespace background diff --git a/src/game/client/bother.cc b/src/game/client/bother.cc index 8bd7182..7b10be5 100644 --- a/src/game/client/bother.cc +++ b/src/game/client/bother.cc @@ -47,7 +47,7 @@ void bother::init(void) bother_dispatcher.sink<protocol::StatusResponse>().connect<&on_status_response_packet>(); } -void bother::deinit(void) +void bother::shutdown(void) { enet_host_destroy(bother_host); bother_dispatcher.clear(); diff --git a/src/game/client/bother.hh b/src/game/client/bother.hh index fab62d1..2ff44cf 100644 --- a/src/game/client/bother.hh +++ b/src/game/client/bother.hh @@ -14,7 +14,7 @@ struct BotherResponseEvent final { namespace bother { void init(void); -void deinit(void); +void shutdown(void); void update_late(void); void ping(unsigned int identity, const char* host, std::uint16_t port); void cancel(unsigned int identity); diff --git a/src/game/client/chat.cc b/src/game/client/chat.cc index 0a0c75d..2dfea38 100644 --- a/src/game/client/chat.cc +++ b/src/game/client/chat.cc @@ -145,7 +145,7 @@ void client_chat::init_late(void) { } -void client_chat::deinit(void) +void client_chat::shutdown(void) { sfx_chat_message = nullptr; } diff --git a/src/game/client/chat.hh b/src/game/client/chat.hh index 6eb77fd..300cb1f 100644 --- a/src/game/client/chat.hh +++ b/src/game/client/chat.hh @@ -6,7 +6,7 @@ namespace client_chat { void init(void); void init_late(void); -void deinit(void); +void shutdown(void); void update(void); void layout(void); } // namespace client_chat diff --git a/src/game/client/chunk_mesher.cc b/src/game/client/chunk_mesher.cc index 0271931..24abfa3 100644 --- a/src/game/client/chunk_mesher.cc +++ b/src/game/client/chunk_mesher.cc @@ -451,7 +451,7 @@ void chunk_mesher::init(void) globals::dispatcher.sink<VoxelSetEvent>().connect<&on_voxel_set>(); } -void chunk_mesher::deinit(void) +void chunk_mesher::shutdown(void) { } diff --git a/src/game/client/chunk_mesher.hh b/src/game/client/chunk_mesher.hh index ab65fae..ca234f0 100644 --- a/src/game/client/chunk_mesher.hh +++ b/src/game/client/chunk_mesher.hh @@ -12,7 +12,7 @@ struct ChunkMeshComponent final { namespace chunk_mesher { void init(void); -void deinit(void); +void shutdown(void); void update(void); } // namespace chunk_mesher diff --git a/src/game/client/chunk_renderer.cc b/src/game/client/chunk_renderer.cc index 54239af..a7f3148 100644 --- a/src/game/client/chunk_renderer.cc +++ b/src/game/client/chunk_renderer.cc @@ -75,7 +75,7 @@ void chunk_renderer::init(void) glVertexAttribPointer(0, 3, GL_FLOAT, false, sizeof(glm::fvec3), nullptr); } -void chunk_renderer::deinit(void) +void chunk_renderer::shutdown(void) { glDeleteBuffers(1, &quad_vbo); glDeleteVertexArrays(1, &quad_vaobj); diff --git a/src/game/client/chunk_renderer.hh b/src/game/client/chunk_renderer.hh index 84688f7..e005191 100644 --- a/src/game/client/chunk_renderer.hh +++ b/src/game/client/chunk_renderer.hh @@ -5,7 +5,7 @@ namespace chunk_renderer { void init(void); -void deinit(void); +void shutdown(void); void render(void); } // namespace chunk_renderer diff --git a/src/game/client/crosshair.cc b/src/game/client/crosshair.cc index 84a9a73..7a878a9 100644 --- a/src/game/client/crosshair.cc +++ b/src/game/client/crosshair.cc @@ -22,7 +22,7 @@ void crosshair::init(void) } } -void crosshair::deinit(void) +void crosshair::shutdown(void) { texture = nullptr; } diff --git a/src/game/client/crosshair.hh b/src/game/client/crosshair.hh index 8bcf86b..ad202d1 100644 --- a/src/game/client/crosshair.hh +++ b/src/game/client/crosshair.hh @@ -5,7 +5,7 @@ namespace crosshair { void init(void); -void deinit(void); +void shutdown(void); void layout(void); } // namespace crosshair diff --git a/src/game/client/experiments.cc b/src/game/client/experiments.cc index 70353b5..4751208 100644 --- a/src/game/client/experiments.cc +++ b/src/game/client/experiments.cc @@ -50,7 +50,7 @@ void experiments::init_late(void) hotbar::slots[8] = game_items::slime; } -void experiments::deinit(void) +void experiments::shutdown(void) { } diff --git a/src/game/client/experiments.hh b/src/game/client/experiments.hh index 7a83048..a2ce66a 100644 --- a/src/game/client/experiments.hh +++ b/src/game/client/experiments.hh @@ -6,7 +6,7 @@ namespace experiments { void init(void); void init_late(void); -void deinit(void); +void shutdown(void); void update(void); void update_late(void); } // namespace experiments diff --git a/src/game/client/game.cc b/src/game/client/game.cc index c930f38..8d157b0 100644 --- a/src/game/client/game.cc +++ b/src/game/client/game.cc @@ -412,29 +412,29 @@ void client_game::init_late(void) window_title::update(); } -void client_game::deinit(void) +void client_game::shutdown(void) { - voxel_sounds::deinit(); + voxel_sounds::shutdown(); - experiments::deinit(); + experiments::shutdown(); - session::deinit(); + session::shutdown(); if(globals::sound_ctx) { - sound::deinit(); + sound::shutdown(); } - hotbar::deinit(); - main_menu::deinit(); - play_menu::deinit(); + hotbar::shutdown(); + main_menu::shutdown(); + play_menu::shutdown(); - bother::deinit(); + bother::shutdown(); - client_chat::deinit(); + client_chat::shutdown(); - background::deinit(); + background::shutdown(); - crosshair::deinit(); + crosshair::shutdown(); delete globals::dimension; globals::player = entt::null; @@ -449,9 +449,9 @@ void client_game::deinit(void) glDeleteTextures(1, &globals::world_fbo_color); glDeleteFramebuffers(1, &globals::world_fbo); - outline::deinit(); - chunk_renderer::deinit(); - chunk_mesher::deinit(); + outline::shutdown(); + chunk_renderer::shutdown(); + chunk_mesher::shutdown(); enet_host_destroy(globals::client_host); diff --git a/src/game/client/game.hh b/src/game/client/game.hh index 0735719..09ab60b 100644 --- a/src/game/client/game.hh +++ b/src/game/client/game.hh @@ -24,7 +24,7 @@ namespace client_game { void init(void); void init_late(void); -void deinit(void); +void shutdown(void); void fixed_update(void); void fixed_update_late(void); void update(void); diff --git a/src/game/client/hotbar.cc b/src/game/client/hotbar.cc index a2ed859..6481f08 100644 --- a/src/game/client/hotbar.cc +++ b/src/game/client/hotbar.cc @@ -113,7 +113,7 @@ void hotbar::init(void) globals::dispatcher.sink<GlfwScrollEvent>().connect<&on_glfw_scroll>(); } -void hotbar::deinit(void) +void hotbar::shutdown(void) { hotbar_background = nullptr; hotbar_selector = nullptr; diff --git a/src/game/client/hotbar.hh b/src/game/client/hotbar.hh index 186bc6e..e16f3fa 100644 --- a/src/game/client/hotbar.hh +++ b/src/game/client/hotbar.hh @@ -18,7 +18,7 @@ extern item_id slots[HOTBAR_SIZE]; namespace hotbar { void init(void); -void deinit(void); +void shutdown(void); void layout(void); } // namespace hotbar diff --git a/src/game/client/main.cc b/src/game/client/main.cc index d9e915c..817e09a 100644 --- a/src/game/client/main.cc +++ b/src/game/client/main.cc @@ -406,7 +406,7 @@ int main(int argc, char** argv) threading::update(); } - client_game::deinit(); + client_game::shutdown(); resource::hard_cleanup<BinFile>(); resource::hard_cleanup<Image>(); @@ -433,9 +433,9 @@ int main(int argc, char** argv) globals::client_config.save_file("client.conf"); - threading::deinit(); + threading::shutdown(); - shared_game::deinit(); + shared_game::shutdown(); return EXIT_SUCCESS; } diff --git a/src/game/client/main_menu.cc b/src/game/client/main_menu.cc index e5cb522..382f540 100644 --- a/src/game/client/main_menu.cc +++ b/src/game/client/main_menu.cc @@ -68,7 +68,7 @@ void main_menu::init(void) globals::dispatcher.sink<LanguageSetEvent>().connect<&on_language_set>(); } -void main_menu::deinit(void) +void main_menu::shutdown(void) { title = nullptr; } diff --git a/src/game/client/main_menu.hh b/src/game/client/main_menu.hh index f127c5f..fea0ba9 100644 --- a/src/game/client/main_menu.hh +++ b/src/game/client/main_menu.hh @@ -5,7 +5,7 @@ namespace main_menu { void init(void); -void deinit(void); +void shutdown(void); void layout(void); } // namespace main_menu diff --git a/src/game/client/outline.cc b/src/game/client/outline.cc index 31a6bd9..bde179b 100644 --- a/src/game/client/outline.cc +++ b/src/game/client/outline.cc @@ -88,7 +88,7 @@ void outline::init(void) glVertexAttribDivisor(0, 0); } -void outline::deinit(void) +void outline::shutdown(void) { glDeleteVertexArrays(1, &vaobj); glDeleteBuffers(1, &line_vbo); diff --git a/src/game/client/outline.hh b/src/game/client/outline.hh index da8e232..6d7583e 100644 --- a/src/game/client/outline.hh +++ b/src/game/client/outline.hh @@ -7,7 +7,7 @@ namespace outline { void init(void); -void deinit(void); +void shutdown(void); void prepare(void); } // namespace outline diff --git a/src/game/client/play_menu.cc b/src/game/client/play_menu.cc index b9a6693..51ce30c 100644 --- a/src/game/client/play_menu.cc +++ b/src/game/client/play_menu.cc @@ -477,7 +477,7 @@ void play_menu::init(void) globals::dispatcher.sink<BotherResponseEvent>().connect<&on_bother_response>(); } -void play_menu::deinit(void) +void play_menu::shutdown(void) { std::ostringstream stream; diff --git a/src/game/client/play_menu.hh b/src/game/client/play_menu.hh index ddf97f9..5714397 100644 --- a/src/game/client/play_menu.hh +++ b/src/game/client/play_menu.hh @@ -5,7 +5,7 @@ namespace play_menu { void init(void); -void deinit(void); +void shutdown(void); void layout(void); void update_late(void); } // namespace play_menu diff --git a/src/game/client/session.cc b/src/game/client/session.cc index d3676f3..171ef5f 100644 --- a/src/game/client/session.cc +++ b/src/game/client/session.cc @@ -144,7 +144,7 @@ void session::init(void) globals::dispatcher.sink<VoxelSetEvent>().connect<&on_voxel_set>(); } -void session::deinit(void) +void session::shutdown(void) { session::disconnect("protocol.client_shutdown"); diff --git a/src/game/client/session.hh b/src/game/client/session.hh index 0ba0fc6..a763d18 100644 --- a/src/game/client/session.hh +++ b/src/game/client/session.hh @@ -12,7 +12,7 @@ extern std::uint64_t client_identity; namespace session { void init(void); -void deinit(void); +void shutdown(void); void invalidate(void); } // namespace session diff --git a/src/game/client/settings.cc b/src/game/client/settings.cc index 46e1bde..54d6ba2 100644 --- a/src/game/client/settings.cc +++ b/src/game/client/settings.cc @@ -779,7 +779,7 @@ void settings::init_late(void) refresh_input_wids(); } -void settings::deinit(void) +void settings::shutdown(void) { for(const SettingValue* value : values_all) delete value; diff --git a/src/game/client/settings.hh b/src/game/client/settings.hh index 388fdab..180f384 100644 --- a/src/game/client/settings.hh +++ b/src/game/client/settings.hh @@ -34,7 +34,7 @@ namespace settings { void init(void); void init_late(void); -void deinit(void); +void shutdown(void); void layout(void); } // namespace settings diff --git a/src/game/client/sound.cc b/src/game/client/sound.cc index 28e0143..10f77c0 100644 --- a/src/game/client/sound.cc +++ b/src/game/client/sound.cc @@ -71,7 +71,7 @@ void sound::init_late(void) { } -void sound::deinit(void) +void sound::shutdown(void) { sfx_ui = nullptr; sfx_player = nullptr; diff --git a/src/game/client/sound.hh b/src/game/client/sound.hh index 23fbca9..bba9916 100644 --- a/src/game/client/sound.hh +++ b/src/game/client/sound.hh @@ -20,7 +20,7 @@ namespace sound void init_config(void); void init(void); void init_late(void); -void deinit(void); +void shutdown(void); void update(void); } // namespace sound diff --git a/src/game/client/voxel_sounds.cc b/src/game/client/voxel_sounds.cc index fd02a8e..996dc61 100644 --- a/src/game/client/voxel_sounds.cc +++ b/src/game/client/voxel_sounds.cc @@ -60,7 +60,7 @@ void voxel_sounds::init(void) add_footsteps_effect(voxel_surface::WOOD, "sounds/surface/wood3.wav"); } -void voxel_sounds::deinit(void) +void voxel_sounds::shutdown(void) { for(std::size_t i = 0; i < NUM_SURFACES; ++i) { footsteps_sounds[i].clear(); diff --git a/src/game/client/voxel_sounds.hh b/src/game/client/voxel_sounds.hh index 37e1fe9..86a5e99 100644 --- a/src/game/client/voxel_sounds.hh +++ b/src/game/client/voxel_sounds.hh @@ -11,7 +11,7 @@ struct SoundEffect; namespace voxel_sounds { void init(void); -void deinit(void); +void shutdown(void); } // namespace voxel_sounds namespace voxel_sounds 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 diff --git a/src/game/shared/game.cc b/src/game/shared/game.cc index 73de8b5..6e0037b 100644 --- a/src/game/shared/game.cc +++ b/src/game/shared/game.cc @@ -110,7 +110,7 @@ void shared_game::init(int argc, char** argv) } } -void shared_game::deinit(void) +void shared_game::shutdown(void) { enet_deinitialize(); diff --git a/src/game/shared/game.hh b/src/game/shared/game.hh index a9d79e4..06c1f51 100644 --- a/src/game/shared/game.hh +++ b/src/game/shared/game.hh @@ -5,7 +5,7 @@ namespace shared_game { void init(int argc, char** argv); -void deinit(void); +void shutdown(void); } // namespace shared_game #endif // SHARED_GAME diff --git a/src/game/shared/threading.cc b/src/game/shared/threading.cc index 9e46d17..e479506 100644 --- a/src/game/shared/threading.cc +++ b/src/game/shared/threading.cc @@ -57,7 +57,7 @@ void threading::init(void) task_deque.clear(); } -void threading::deinit(void) +void threading::shutdown(void) { for(auto task : task_deque) { auto status = task->get_status(); diff --git a/src/game/shared/threading.hh b/src/game/shared/threading.hh index 474d616..02903d5 100644 --- a/src/game/shared/threading.hh +++ b/src/game/shared/threading.hh @@ -26,7 +26,7 @@ protected: namespace threading { void init(void); -void deinit(void); +void shutdown(void); void update(void); } // namespace threading |