gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 15:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r19498) -Feature [FS#3710]: Keep number padding intact when cloning vehicle names.

Browse Source
This commit is contained in:
peter1138 2010-03-21 11:35:41 +00:00
parent c049bf3f38
commit e188c5d87c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vehicle_cmd.cpp
View File

@ -359,6 +359,7 @@ static void CloneVehicleName(const Vehicle *src, Vehicle *dst)
/* Format buffer and determine starting number. */ /* Format buffer and determine starting number. */
int num; int num;
byte padding = 0;
if (number_position == strlen(src->name)) { if (number_position == strlen(src->name)) {
/* No digit at the end, so start at number 2. */ /* No digit at the end, so start at number 2. */
strecpy(buf, src->name, lastof(buf)); strecpy(buf, src->name, lastof(buf));
@ -369,13 +370,15 @@ static void CloneVehicleName(const Vehicle *src, Vehicle *dst)
/* Found digits, parse them and start at the next number. */ /* Found digits, parse them and start at the next number. */
strecpy(buf, src->name, lastof(buf)); strecpy(buf, src->name, lastof(buf));
buf[number_position] = '\0'; buf[number_position] = '\0';
num = strtol(&src->name[number_position], NULL, 10) + 1; char *endptr;
num = strtol(&src->name[number_position], &endptr, 10) + 1;
padding = endptr - &src->name[number_position];
} }
/* Check if this name is already taken. */ /* Check if this name is already taken. */
for (int max_iterations = 1000; max_iterations > 0; max_iterations--, num++) { for (int max_iterations = 1000; max_iterations > 0; max_iterations--, num++) {
/* Attach the number to the temporary name. */ /* Attach the number to the temporary name. */
seprintf(&buf[number_position], lastof(buf), "%d", num); seprintf(&buf[number_position], lastof(buf), "%0*d", padding, num);
/* Check the name is unique. */ /* Check the name is unique. */
if (IsUniqueVehicleName(buf)) { if (IsUniqueVehicleName(buf)) {