diff options
| author | Michael Lutz <michi@icosahedron.de> | 2020-05-17 23:31:59 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2020-05-21 20:02:34 +0200 |
| commit | 63ccb36ef3ecd53a503c0e9fea87f0784802af0f (patch) | |
| tree | d3e1134029fd437d1ad2d948f83592b930e9456f /src/group_cmd.cpp | |
| parent | 9b6f5e3bb850b6cff02cc761767fcdf49c681645 (diff) | |
| download | openttd-63ccb36ef3ecd53a503c0e9fea87f0784802af0f.tar.xz | |
Codechange: Use std::string for most of the user-settable custom names.
Diffstat (limited to 'src/group_cmd.cpp')
| -rw-r--r-- | src/group_cmd.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp index 497d74d68..fd63bd153 100644 --- a/src/group_cmd.cpp +++ b/src/group_cmd.cpp @@ -290,11 +290,6 @@ Group::Group(Owner owner) this->folded = false; } -Group::~Group() -{ - free(this->name); -} - /** * Create a new vehicle group. @@ -422,10 +417,12 @@ CommandCost CmdAlterGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 } if (flags & DC_EXEC) { - /* Delete the old name */ - free(g->name); /* Assign the new one */ - g->name = reset ? nullptr : stredup(text); + if (reset) { + g->name.clear(); + } else { + g->name = text; + } } } else { /* Set group parent */ |