summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-12-05 22:24:34 +0000
committerrubidium <rubidium@openttd.org>2010-12-05 22:24:34 +0000
commit768da4b48f8c70177cb5dfc77a30a23a98a3ae05 (patch)
treee1dfd4ae5d33031df1ada23e834fa6c029824979
parentab9cc74ba5cdbb6784f26d354ab4999d605a5ebb (diff)
downloadopenttd-768da4b48f8c70177cb5dfc77a30a23a98a3ae05.tar.xz
(svn r21411) -Codechange: limit group name by amount of characters, not bytes
-rw-r--r--src/ai/api/ai_group.cpp2
-rw-r--r--src/group_cmd.cpp2
-rw-r--r--src/group_gui.cpp2
-rw-r--r--src/group_type.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/ai/api/ai_group.cpp b/src/ai/api/ai_group.cpp
index 5974132c9..abfee1286 100644
--- a/src/ai/api/ai_group.cpp
+++ b/src/ai/api/ai_group.cpp
@@ -52,7 +52,7 @@
{
EnforcePrecondition(false, IsValidGroup(group_id));
EnforcePrecondition(false, !::StrEmpty(name));
- EnforcePreconditionCustomError(false, ::strlen(name) < MAX_LENGTH_GROUP_NAME_BYTES, AIError::ERR_PRECONDITION_STRING_TOO_LONG);
+ EnforcePreconditionCustomError(false, ::Utf8StringLength(name) < MAX_LENGTH_GROUP_NAME_CHARS, AIError::ERR_PRECONDITION_STRING_TOO_LONG);
return AIObject::DoCommand(0, group_id, 0, CMD_RENAME_GROUP, name);
}
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index 8f34d3f7f..ba68515fd 100644
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -181,7 +181,7 @@ CommandCost CmdRenameGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
bool reset = StrEmpty(text);
if (!reset) {
- if (strlen(text) >= MAX_LENGTH_GROUP_NAME_BYTES) 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);
}
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index e6ef1dc54..0fb125933 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -625,7 +625,7 @@ public:
SetDParam(0, group);
str = STR_GROUP_NAME;
}
- ShowQueryString(str, STR_GROUP_RENAME_CAPTION, MAX_LENGTH_GROUP_NAME_BYTES, MAX_LENGTH_GROUP_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT);
+ ShowQueryString(str, STR_GROUP_RENAME_CAPTION, MAX_LENGTH_GROUP_NAME_CHARS, MAX_LENGTH_GROUP_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS);
}
/**
diff --git a/src/group_type.h b/src/group_type.h
index ed883eabd..c078c199e 100644
--- a/src/group_type.h
+++ b/src/group_type.h
@@ -18,7 +18,7 @@ static const GroupID ALL_GROUP = 0xFFFD;
static const GroupID DEFAULT_GROUP = 0xFFFE; ///< ungrouped vehicles are in this group.
static const GroupID INVALID_GROUP = 0xFFFF;
-static const uint MAX_LENGTH_GROUP_NAME_BYTES = 31; ///< The maximum length of a group name in bytes including '\0'
+static const uint MAX_LENGTH_GROUP_NAME_CHARS = 31; ///< The maximum length of a group name in characters including '\0'
static const uint MAX_LENGTH_GROUP_NAME_PIXELS = 150; ///< The maximum length of a group name in pixels
struct Group;