diff options
| author | rubidium42 <rubidium@openttd.org> | 2021-05-29 16:09:25 +0200 |
|---|---|---|
| committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-05-29 19:02:18 +0200 |
| commit | 2e136285e1dfb4435c11769bf7cabb1ec2057e08 (patch) | |
| tree | bd6cd67422cc6649a2b75761b52ad220de71b24e /src/news_gui.cpp | |
| parent | 661728558e9ce2eb8cfdb6afd7182b85e1f19a67 (diff) | |
| download | openttd-2e136285e1dfb4435c11769bf7cabb1ec2057e08.tar.xz | |
Codechange: move from C-string to std::string for DoCommand
Diffstat (limited to 'src/news_gui.cpp')
| -rw-r--r-- | src/news_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 58d62dde8..8dc66c846 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -840,7 +840,7 @@ void AddNewsItem(StringID string, NewsType type, NewsFlag flags, NewsReferenceTy * @param text The text of the news message. * @return the cost of this operation or an error */ -CommandCost CmdCustomNewsItem(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) +CommandCost CmdCustomNewsItem(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const std::string &text) { if (_current_company != OWNER_DEITY) return CMD_ERROR; @@ -850,7 +850,7 @@ CommandCost CmdCustomNewsItem(TileIndex tile, DoCommandFlag flags, uint32 p1, ui if (company != INVALID_OWNER && !Company::IsValidID(company)) return CMD_ERROR; if (type >= NT_END) return CMD_ERROR; - if (StrEmpty(text)) return CMD_ERROR; + if (text.empty()) return CMD_ERROR; switch (reftype1) { case NR_NONE: break; @@ -884,7 +884,7 @@ CommandCost CmdCustomNewsItem(TileIndex tile, DoCommandFlag flags, uint32 p1, ui if (company != INVALID_OWNER && company != _local_company) return CommandCost(); if (flags & DC_EXEC) { - char *news = stredup(text); + char *news = stredup(text.c_str()); SetDParamStr(0, news); AddNewsItem(STR_NEWS_CUSTOM_ITEM, type, NF_NORMAL, reftype1, p2, NR_NONE, UINT32_MAX, news); } |