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

(svn r21411) -Codechange: limit group name by amount of characters, not bytes

release/1.1
rubidium 2010-12-05 22:24:34 +00:00
parent ab9cc74ba5
commit 768da4b48f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/api/ai_group.cpp
View File

@ -52,7 +52,7 @@
{ {
EnforcePrecondition(false, IsValidGroup(group_id)); EnforcePrecondition(false, IsValidGroup(group_id));
EnforcePrecondition(false, !::StrEmpty(name)); 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); return AIObject::DoCommand(0, group_id, 0, CMD_RENAME_GROUP, name);
} }

2
src/group_cmd.cpp
View File

@ -181,7 +181,7 @@ CommandCost CmdRenameGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
bool reset = StrEmpty(text); bool reset = StrEmpty(text);
if (!reset) { 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); if (!IsUniqueGroupName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
} }

2
src/group_gui.cpp
View File

@ -625,7 +625,7 @@ public:
SetDParam(0, group); SetDParam(0, group);
str = STR_GROUP_NAME; 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);
} }
/** /**

2
src/group_type.h
View File

@ -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 DEFAULT_GROUP = 0xFFFE; ///< ungrouped vehicles are in this group.
static const GroupID INVALID_GROUP = 0xFFFF; 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 static const uint MAX_LENGTH_GROUP_NAME_PIXELS = 150; ///< The maximum length of a group name in pixels
struct Group; struct Group;