Mercurial > hg > openttd

changeset 20001:e8d8e2938dd6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r24933) -Fix [FS#3473]: Make group names unique per company and vehicle type.
author peter1138 <peter1138@openttd.org>
date Tue, 22 Jan 2013 14:31:01 +0000
parents 6c78ce03b517
children 8d4cab20dccf
files src/group_cmd.cpp
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -340,12 +340,12 @@
 	return CommandCost();
 }
 
-static bool IsUniqueGroupName(const char *name)
+static bool IsUniqueGroupNameForVehicleType(const char *name, VehicleType type)
 {
 	const Group *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;
@@ -370,7 +370,7 @@
 
 	if (!reset) {
 		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) {