cpp/openttd-patchpack/source Changeset - r16668:989c9aae97ec

Changeset - r16668:989c9aae97ec

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 14 years ago 2010-12-05 22:24:04
rubidium@openttd.org

(svn r21409) -Codechange: limit depot name by amount of characters, not bytes

3 files changed with 3 insertions and 3 deletions:

src/depot_cmd.cpp

src/depot_gui.cpp

src/depot_type.h

0 comments (0 inline, 0 general)

src/depot_cmd.cpp

➞

Show inline comments

@@ @@ -53,7 +53,7 @@ CommandCost CmdRenameDepot(TileIndex til @@
 	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);
+	}

src/depot_gui.cpp

➞

Show inline comments

@@ @@ -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:

src/depot_type.h

➞

Show inline comments

@@ @@ -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 */

0 comments (0 inline, 0 general)