From 9955c8681db57525923037b983070aa5dc5061ca Mon Sep 17 00:00:00 2001 From: Erich Newey Date: Thu, 12 Oct 2023 22:38:14 -0600 Subject: [PATCH] remove string extract logic from game_windows some related code changed during the rebase and this no longer appears to be necessary --- src/game_strings.h | 3 ++- src/game_windows.cpp | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game_strings.h b/src/game_strings.h index c7b038df597..10850eeb42f 100644 --- a/src/game_strings.h +++ b/src/game_strings.h @@ -85,8 +85,9 @@ inline Game_Strings::Str_t Game_Strings::Set(Str_Params params, Str_t string) { auto& s = _strings[params.string_id - 1]; s = string; - if (params.extract) + if (params.extract) { s = Extract(s, params.hex); + } return s; } diff --git a/src/game_windows.cpp b/src/game_windows.cpp index bf4f7cabd7d..4728f4636ee 100644 --- a/src/game_windows.cpp +++ b/src/game_windows.cpp @@ -204,8 +204,7 @@ void Game_Windows::Window_User::Refresh(bool& async_wait) { fonts.emplace_back(font); - std::string extracted_text = Main_Data::game_strings->Extract(ToString(text.text), false); - std::stringstream ss(extracted_text); + std::stringstream ss(ToString(text.text)); std::string out; PendingMessage pm; while (Utils::ReadLine(ss, out)) {