From 67068cfaf43ef95e526401d9f788790516b9f8ed Mon Sep 17 00:00:00 2001 From: Desour Date: Fri, 3 Mar 2023 01:18:38 +0100 Subject: Get rid of wgettext --- src/client/client.cpp | 27 ++++++++++----------------- src/client/clientlauncher.cpp | 4 +--- src/client/game.cpp | 33 ++++++++++----------------------- src/client/gameui.cpp | 4 +--- 4 files changed, 22 insertions(+), 46 deletions(-) (limited to 'src/client') diff --git a/src/client/client.cpp b/src/client/client.cpp index 28fdad72a..d68150cbb 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -339,7 +339,7 @@ Client::~Client() m_mesh_update_manager.stop(); m_mesh_update_manager.wait(); - + MeshUpdateResult r; while (m_mesh_update_manager.getNextResult(r)) { for (auto block : r.map_blocks) @@ -1751,7 +1751,7 @@ struct TextureUpdateArgs { gui::IGUIEnvironment *guienv; u64 last_time_ms; u16 last_percent; - const wchar_t* text_base; + std::wstring text_base; ITextureSource *tsrc; }; @@ -1786,8 +1786,6 @@ void Client::afterContentReceived() assert(m_nodedef_received); // pre-condition assert(mediaReceived()); // pre-condition - const wchar_t* text = wgettext("Loading textures..."); - // Clear cached pre-scaled 2D GUI images, as this cache // might have images with the same name but different // content from previous sessions. @@ -1795,21 +1793,20 @@ void Client::afterContentReceived() // Rebuild inherited images and recreate textures infostream<<"- Rebuilding images and textures"<draw_load_screen(text, guienv, m_tsrc, 0, 70); + m_rendering_engine->draw_load_screen(wstrgettext("Loading textures..."), + guienv, m_tsrc, 0, 70); m_tsrc->rebuildImagesAndTextures(); - delete[] text; // Rebuild shaders infostream<<"- Rebuilding shaders"<draw_load_screen(text, guienv, m_tsrc, 0, 71); + m_rendering_engine->draw_load_screen(wstrgettext("Rebuilding shaders..."), + guienv, m_tsrc, 0, 71); m_shsrc->rebuildShaders(); - delete[] text; // Update node aliases infostream<<"- Updating node aliases"<draw_load_screen(text, guienv, m_tsrc, 0, 72); + m_rendering_engine->draw_load_screen(wstrgettext("Initializing nodes..."), + guienv, m_tsrc, 0, 72); m_nodedef->updateAliases(m_itemdef); for (const auto &path : getTextureDirs()) { TextureOverrideSource override_source(path + DIR_DELIM + "override.txt"); @@ -1818,7 +1815,6 @@ void Client::afterContentReceived() } m_nodedef->setNodeRegistrationStatus(true); m_nodedef->runNodeResolveCallbacks(); - delete[] text; // Update node textures and assign shaders to each tile infostream<<"- Updating node textures"<updateTextures(this, &tu_args); - delete[] tu_args.text_base; // Start mesh update thread after setting up content definitions infostream<<"- Starting mesh update thread"<on_client_ready(m_env.getLocalPlayer()); - text = wgettext("Done!"); - m_rendering_engine->draw_load_screen(text, guienv, m_tsrc, 0, 100); + m_rendering_engine->draw_load_screen(wstrgettext("Done!"), guienv, m_tsrc, 0, 100); infostream<<"Client::afterContentReceived() done"<run() && !*kill && !g_gamecallback->shutdown_requested) { // Set the window caption - const wchar_t *text = wgettext("Main Menu"); m_rendering_engine->get_raw_device()-> setWindowCaption((utf8_to_wide(PROJECT_NAME_C) + L" " + utf8_to_wide(g_version_hash) + - L" [" + text + L"]").c_str()); - delete[] text; + L" [" + wstrgettext("Main Menu") + L"]").c_str()); try { // This is used for catching disconnects diff --git a/src/client/game.cpp b/src/client/game.cpp index e42e6d338..4a8ef9969 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -1520,17 +1520,10 @@ bool Game::createClient(const GameStartData &start_data) std::wstring str = utf8_to_wide(PROJECT_NAME_C); str += L" "; str += utf8_to_wide(g_version_hash); - { - const wchar_t *text = nullptr; - if (simple_singleplayer_mode) - text = wgettext("Singleplayer"); - else - text = wgettext("Multiplayer"); - str += L" ["; - str += text; - str += L"]"; - delete[] text; - } + str += L" ["; + str += simple_singleplayer_mode ? wstrgettext("Singleplayer") + : wstrgettext("Multiplayer"); + str += L"]"; str += L" ["; str += driver->getName(); str += L"]"; @@ -1746,17 +1739,13 @@ bool Game::getServerContent(bool *aborted) int progress = 25; if (!client->itemdefReceived()) { - const wchar_t *text = wgettext("Item definitions..."); progress = 25; - m_rendering_engine->draw_load_screen(text, guienv, texture_src, - dtime, progress); - delete[] text; + m_rendering_engine->draw_load_screen(wstrgettext("Item definitions..."), + guienv, texture_src, dtime, progress); } else if (!client->nodedefReceived()) { - const wchar_t *text = wgettext("Node definitions..."); progress = 30; - m_rendering_engine->draw_load_screen(text, guienv, texture_src, - dtime, progress); - delete[] text; + m_rendering_engine->draw_load_screen(wstrgettext("Node definitions..."), + guienv, texture_src, dtime, progress); } else { std::ostringstream message; std::fixed(message); @@ -4279,10 +4268,8 @@ void FpsControl::limit(IrrlichtDevice *device, f32 *dtime) void Game::showOverlayMessage(const char *msg, float dtime, int percent, bool draw_clouds) { - const wchar_t *wmsg = wgettext(msg); - m_rendering_engine->draw_load_screen(wmsg, guienv, texture_src, dtime, percent, - draw_clouds); - delete[] wmsg; + m_rendering_engine->draw_load_screen(wstrgettext(msg), guienv, texture_src, + dtime, percent, draw_clouds); } void Game::settingChangedCallback(const std::string &setting_name, void *data) diff --git a/src/client/gameui.cpp b/src/client/gameui.cpp index 8d346980c..d448eadd6 100644 --- a/src/client/gameui.cpp +++ b/src/client/gameui.cpp @@ -226,9 +226,7 @@ void GameUI::showMinimap(bool show) void GameUI::showTranslatedStatusText(const char *str) { - const wchar_t *wmsg = wgettext(str); - showStatusText(wmsg); - delete[] wmsg; + showStatusText(wstrgettext(str)); } void GameUI::setChatText(const EnrichedString &chat_text, u32 recent_chat_count) -- cgit v1.2.3