diff options
| author | rubidium <rubidium@openttd.org> | 2010-12-05 22:24:04 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-12-05 22:24:04 +0000 |
| commit | 091263317e7eb8a882813a11f6da53058c266df5 (patch) | |
| tree | 1d04254627126917ad0b56c2c296335dca137506 | |
| parent | 9a1805064654d5f0e348f8a7b990532bfb66921a (diff) | |
| download | openttd-091263317e7eb8a882813a11f6da53058c266df5.tar.xz | |
(svn r21409) -Codechange: limit depot name by amount of characters, not bytes
| -rw-r--r-- | src/depot_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/depot_gui.cpp | 2 | ||||
| -rw-r--r-- | src/depot_type.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/depot_cmd.cpp b/src/depot_cmd.cpp index 2c507f73f..159c5bb04 100644 --- a/src/depot_cmd.cpp +++ b/src/depot_cmd.cpp @@ -53,7 +53,7 @@ CommandCost CmdRenameDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 bool reset = StrEmpty(text); if (!reset) { - if (strlen(text) >= MAX_LENGTH_DEPOT_NAME_BYTES) return CMD_ERROR; + if (Utf8StringLength(text) >= MAX_LENGTH_DEPOT_NAME_CHARS) return CMD_ERROR; if (!IsUniqueDepotName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE); } diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp index b94452ea4..54ebecdbe 100644 --- a/src/depot_gui.cpp +++ b/src/depot_gui.cpp @@ -738,7 +738,7 @@ struct DepotWindow : Window { case DEPOT_WIDGET_RENAME: // Rename button SetDParam(0, this->type); SetDParam(1, Depot::GetByTile((TileIndex)this->window_number)->index); - ShowQueryString(STR_DEPOT_NAME, STR_DEPOT_RENAME_DEPOT_CAPTION, MAX_LENGTH_DEPOT_NAME_BYTES, MAX_LENGTH_DEPOT_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); + ShowQueryString(STR_DEPOT_NAME, STR_DEPOT_RENAME_DEPOT_CAPTION, MAX_LENGTH_DEPOT_NAME_CHARS, MAX_LENGTH_DEPOT_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS); break; case DEPOT_WIDGET_STOP_ALL: diff --git a/src/depot_type.h b/src/depot_type.h index ab6013e13..ce23c5794 100644 --- a/src/depot_type.h +++ b/src/depot_type.h @@ -15,7 +15,7 @@ typedef uint16 DepotID; struct Depot; -static const uint MAX_LENGTH_DEPOT_NAME_BYTES = 31; ///< The maximum length of a depot name in bytes including '\0' +static const uint MAX_LENGTH_DEPOT_NAME_CHARS = 31; ///< The maximum length of a depot name in characters including '\0' static const uint MAX_LENGTH_DEPOT_NAME_PIXELS = 180; ///< The maximum length of a depot name in pixels #endif /* DEPOT_TYPE_H */ |