cpp/openttd-patchpack/source Changeset - r16675:cf6020bfed67

Changeset - r16675:cf6020bfed67

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 13 years ago 2010-12-05 22:25:49
rubidium@openttd.org

(svn r21416) -Codechange: limit vehicle name by amount of characters, not bytes

4 files changed with 4 insertions and 4 deletions:

src/ai/api/ai_vehicle.cpp

src/vehicle_cmd.cpp

src/vehicle_gui.cpp

src/vehicle_type.h

0 comments (0 inline, 0 general)

src/ai/api/ai_vehicle.cpp

➞

Show inline comments

@@ @@ -208,7 +208,7 @@ @@
+{
 	EnforcePrecondition(false, IsValidVehicle(vehicle_id));
 	EnforcePrecondition(false, !::StrEmpty(name));
-	EnforcePreconditionCustomError(false, ::strlen(name) < MAX_LENGTH_VEHICLE_NAME_BYTES, AIError::ERR_PRECONDITION_STRING_TOO_LONG);
+	EnforcePreconditionCustomError(false, ::Utf8StringLength(name) < MAX_LENGTH_VEHICLE_NAME_CHARS, AIError::ERR_PRECONDITION_STRING_TOO_LONG);
 	return AIObject::DoCommand(0, vehicle_id, 0, CMD_RENAME_VEHICLE, name);
+}

src/vehicle_cmd.cpp

➞

Show inline comments

@@ @@ -882,7 +882,7 @@ CommandCost CmdRenameVehicle(TileIndex t @@
 	bool reset = StrEmpty(text);
 	if (!reset) {
-		if (strlen(text) >= MAX_LENGTH_VEHICLE_NAME_BYTES) return CMD_ERROR;
+		if (Utf8StringLength(text) >= MAX_LENGTH_VEHICLE_NAME_CHARS) return CMD_ERROR;
 		if (!(flags & DC_AUTOREPLACE) && !IsUniqueVehicleName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
+	}

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -1810,7 +1810,7 @@ struct VehicleDetailsWindow : Window { @@
 				const Vehicle *v = Vehicle::Get(this->window_number);
 				SetDParam(0, v->index);
 				ShowQueryString(STR_VEHICLE_NAME, STR_QUERY_RENAME_TRAIN_CAPTION + v->type,
-						MAX_LENGTH_VEHICLE_NAME_BYTES, MAX_LENGTH_VEHICLE_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT);
+						MAX_LENGTH_VEHICLE_NAME_CHARS, MAX_LENGTH_VEHICLE_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS);
 				break;
+			}

src/vehicle_type.h

➞

Show inline comments

@@ @@ -64,7 +64,7 @@ enum DepotCommand { @@
 	DEPOT_COMMAND_MASK  = 0xFU << 28,
 };
-static const uint MAX_LENGTH_VEHICLE_NAME_BYTES  =  31; ///< The maximum length of a vehicle name in bytes including '\0'
+static const uint MAX_LENGTH_VEHICLE_NAME_CHARS  =  31; ///< The maximum length of a vehicle name in characters including '\0'
 static const uint MAX_LENGTH_VEHICLE_NAME_PIXELS = 150; ///< The maximum length of a vehicle name in pixels
 /** Vehicle acceleration models. */

0 comments (0 inline, 0 general)