From 14915526ad64592211eaed70ecaab63d50989847 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sun, 4 Jun 2023 21:46:21 +0200 Subject: [PATCH] Cleanup: remove stre-style GetString --- src/strings.cpp | 15 +++------------ src/strings_func.h | 1 - 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/strings.cpp b/src/strings.cpp index 13a55c7898..99210bee55 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -281,15 +281,6 @@ void GetStringWithArgs(StringBuilder &builder, StringID string, StringParameters FormatString(builder, GetStringPtr(string), args, case_index); } -char *GetString(char *buffr, StringID string, const char *last) -{ - _global_string_params.ClearTypeInformation(); - _global_string_params.offset = 0; - StringBuilder builder(&buffr, last); - GetStringWithArgs(builder, string, &_global_string_params); - return builder.GetEnd(); -} - /** * Resolve the given StringID into a std::string with all the associated @@ -299,9 +290,9 @@ char *GetString(char *buffr, StringID string, const char *last) */ std::string GetString(StringID string) { - char buffer[DRAW_STRING_BUFFER]; - GetString(buffer, string, lastof(buffer)); - return buffer; + _global_string_params.ClearTypeInformation(); + _global_string_params.offset = 0; + return GetStringWithArgs(string, &_global_string_params); } /** diff --git a/src/strings_func.h b/src/strings_func.h index bcaa42ba99..6d70c2df8c 100644 --- a/src/strings_func.h +++ b/src/strings_func.h @@ -170,7 +170,6 @@ public: }; extern StringParameters _global_string_params; -char *GetString(char *buffr, StringID string, const char *last); std::string GetString(StringID string); std::string GetStringWithArgs(StringID string, StringParameters *args); const char *GetStringPtr(StringID string);