dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r14334) -Feature: ability to reset name to default/automatic value (for vehicles, engines, towns, groups, stations, waypoints, managers and companies)

Browse Source
This commit is contained in:
smatz
2008-09-15 19:02:50 +00:00
parent 42f33890aa
commit 1266b1a73f
17 changed files with 144 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/waypoint.cpp
View File

@@ -386,26 +386,24 @@ CommandCost CmdRenameWaypoint(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
Waypoint *wp = GetWaypoint(p1);
if (!CheckOwnership(wp->owner)) return CMD_ERROR;
if (!StrEmpty(_cmd_text)) {
bool reset = StrEmpty(_cmd_text);
if (!reset) {
if (strlen(_cmd_text) >= MAX_LENGTH_WAYPOINT_NAME_BYTES) return CMD_ERROR;
if (!IsUniqueWaypointName(_cmd_text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
}
if (flags & DC_EXEC) {
free(wp->name);
if (flags & DC_EXEC) {
free(wp->name);
if (reset) {
MakeDefaultWaypointName(wp); // sets wp->name = NULL
} else {
wp->name = strdup(_cmd_text);
wp->town_cn = 0;
UpdateWaypointSign(wp);
MarkWholeScreenDirty();
}
} else {
if (flags & DC_EXEC) {
free(wp->name);
MakeDefaultWaypointName(wp);
UpdateWaypointSign(wp);
MarkWholeScreenDirty();
}
UpdateWaypointSign(wp);
MarkWholeScreenDirty();
}
return CommandCost();
}