miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Pass encoded script strings as EncodedString.

Browse Source 
This removes the ambiguity of having std::strings that may or may not be encoded.
This commit is contained in:
Peter Nelson
2025-03-04 01:00:40 +00:00
committed by Peter Nelson
parent 2a05a845df
commit b55af05626
34 changed files with 126 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/script/api/script_text.hpp
View File

@@ -11,6 +11,7 @@
#define SCRIPT_TEXT_HPP
#include "script_object.hpp"
#include "../../strings_func.h"
#include <variant>
@@ -25,7 +26,7 @@ public:
* @return A string.
* @api -all
*/
virtual std::string GetEncodedText() = 0;
virtual EncodedString GetEncodedText() = 0;
/**
* Convert a #ScriptText into a decoded normal string.
@@ -43,7 +44,7 @@ class RawText : public Text {
public:
RawText(const std::string &text) : text(text) {}
std::string GetEncodedText() override { return this->text; }
EncodedString GetEncodedText() override { return ::GetEncodedString(STR_JUST_RAW_STRING, this->text); }
private:
const std::string text;
};
@@ -124,7 +125,7 @@ public:
/**
* @api -all
*/
std::string GetEncodedText() override;
EncodedString GetEncodedText() override;
private:
using ScriptTextRef = ScriptObjectRef<ScriptText>;