diff options
| author | rubidium <rubidium@openttd.org> | 2010-12-05 22:24:20 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-12-05 22:24:20 +0000 |
| commit | ab9cc74ba5cdbb6784f26d354ab4999d605a5ebb (patch) | |
| tree | f1b363ac42fb3f6d10f9881e98e2391aa708a302 /src | |
| parent | 091263317e7eb8a882813a11f6da53058c266df5 (diff) | |
| download | openttd-ab9cc74ba5cdbb6784f26d354ab4999d605a5ebb.tar.xz | |
(svn r21410) -Codechange: limit engine name by amount of characters, not bytes
Diffstat (limited to 'src')
| -rw-r--r-- | src/build_vehicle_gui.cpp | 2 | ||||
| -rw-r--r-- | src/engine.cpp | 2 | ||||
| -rw-r--r-- | src/engine_type.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index c25d43703..2f45f3787 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -1211,7 +1211,7 @@ struct BuildVehicleWindow : Window { if (sel_eng != INVALID_ENGINE) { this->rename_engine = sel_eng; SetDParam(0, sel_eng); - ShowQueryString(STR_ENGINE_NAME, STR_QUERY_RENAME_TRAIN_TYPE_CAPTION + this->vehicle_type, MAX_LENGTH_ENGINE_NAME_BYTES, MAX_LENGTH_ENGINE_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT); + ShowQueryString(STR_ENGINE_NAME, STR_QUERY_RENAME_TRAIN_TYPE_CAPTION + this->vehicle_type, MAX_LENGTH_ENGINE_NAME_CHARS, MAX_LENGTH_ENGINE_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS); } break; } diff --git a/src/engine.cpp b/src/engine.cpp index 64ff67040..8e19a2990 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -832,7 +832,7 @@ CommandCost CmdRenameEngine(TileIndex tile, DoCommandFlag flags, uint32 p1, uint bool reset = StrEmpty(text); if (!reset) { - if (strlen(text) >= MAX_LENGTH_ENGINE_NAME_BYTES) return CMD_ERROR; + if (Utf8StringLength(text) >= MAX_LENGTH_ENGINE_NAME_CHARS) return CMD_ERROR; if (!IsUniqueEngineName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE); } diff --git a/src/engine_type.h b/src/engine_type.h index 8c4ee9b7b..6fbede6ab 100644 --- a/src/engine_type.h +++ b/src/engine_type.h @@ -146,7 +146,7 @@ enum EngineFlags { }; static const uint NUM_VEHICLE_TYPES = 6; -static const uint MAX_LENGTH_ENGINE_NAME_BYTES = 31; ///< The maximum length of an engine name in bytes including '\0' +static const uint MAX_LENGTH_ENGINE_NAME_CHARS = 31; ///< The maximum length of an engine name in characters including '\0' static const uint MAX_LENGTH_ENGINE_NAME_PIXELS = 160; ///< The maximum length of an engine name in pixels static const EngineID INVALID_ENGINE = 0xFFFF; |