mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #7673: [Script] Allow removal of custom town text (#7834)

pull/7835/head
glx22 2019-11-14 21:10:03 +01:00 committed by Charles Pigott
parent b533c66f42
commit 0bdbd509be
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/script/api/script_town.cpp
View File

@ -58,9 +58,11 @@
{ {
CCountedPtr<Text> counter(text); CCountedPtr<Text> counter(text);
EnforcePrecondition(false, text != nullptr); const char *encoded_text = nullptr;
const char *encoded_text = text->GetEncodedText(); if (text != nullptr) {
encoded_text = text->GetEncodedText();
EnforcePreconditionEncodedText(false, encoded_text); EnforcePreconditionEncodedText(false, encoded_text);
}
EnforcePrecondition(false, IsValidTown(town_id)); EnforcePrecondition(false, IsValidTown(town_id));
return ScriptObject::DoCommand(::Town::Get(town_id)->xy, town_id, 0, CMD_TOWN_SET_TEXT, encoded_text); return ScriptObject::DoCommand(::Town::Get(town_id)->xy, town_id, 0, CMD_TOWN_SET_TEXT, encoded_text);

4
src/script/api/script_town.hpp
View File

@ -146,7 +146,7 @@ public:
/** /**
* Rename a town. * Rename a town.
* @param town_id The town to rename * @param town_id The town to rename
* @param name The new name of the town. If nullptr or an empty string is passed, the town name will be reset to the default name. * @param name The new name of the town. If null is passed, the town name will be reset to the default name.
* @pre IsValidTown(town_id). * @pre IsValidTown(town_id).
* @return True if the action succeeded. * @return True if the action succeeded.
* @api -ai * @api -ai
@ -156,7 +156,7 @@ public:
/** /**
* Set the custom text of a town, shown in the GUI. * Set the custom text of a town, shown in the GUI.
* @param town_id The town to set the custom text of. * @param town_id The town to set the custom text of.
* @param text The text to set it to (can be either a raw string, or a ScriptText object). * @param text The text to set it to (can be either a raw string, or a ScriptText object). If null is passed, the text will be removed.
* @pre IsValidTown(town_id). * @pre IsValidTown(town_id).
* @return True if the action succeeded. * @return True if the action succeeded.
* @api -ai * @api -ai