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

(svn r24933) -Fix [FS#3473]: Make group names unique per company and vehicle type.

release/1.3
peter1138 2013-01-22 14:31:01 +00:00
parent c18446951d
commit bef25bbdab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/group_cmd.cpp
View File

@ -340,12 +340,12 @@ CommandCost CmdDeleteGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
return CommandCost(); return CommandCost();
} }
static bool IsUniqueGroupName(const char *name) static bool IsUniqueGroupNameForVehicleType(const char *name, VehicleType type)
{ {
const Group *g; const Group *g;
FOR_ALL_GROUPS(g) { FOR_ALL_GROUPS(g) {
if (g->name != NULL && strcmp(g->name, name) == 0) return false; if (g->name != NULL && g->vehicle_type == type && strcmp(g->name, name) == 0) return false;
} }
return true; return true;
@ -370,7 +370,7 @@ CommandCost CmdRenameGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
if (!reset) { if (!reset) {
if (Utf8StringLength(text) >= MAX_LENGTH_GROUP_NAME_CHARS) return CMD_ERROR; if (Utf8StringLength(text) >= MAX_LENGTH_GROUP_NAME_CHARS) return CMD_ERROR;
if (!IsUniqueGroupName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE); if (!IsUniqueGroupNameForVehicleType(text, g->vehicle_type)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {