From 6b86ee9888d177c214a079a1c5d88b680458fff4 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 14 Jan 2011 22:08:40 +0000 Subject: [PATCH] (svn r21797) -Fix/Change: unify the size (in characters) of the string inputs with eachother and TTD to prevent crashes/asserts with e.g. signs that are too long --- src/company_type.h | 2 +- src/depot_type.h | 2 +- src/engine_type.h | 2 +- src/group_type.h | 2 +- src/signs_type.h | 2 +- src/station_type.h | 2 +- src/town_type.h | 2 +- src/vehicle_type.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/company_type.h b/src/company_type.h index 1671f70df8..88949b9ad3 100644 --- a/src/company_type.h +++ b/src/company_type.h @@ -37,7 +37,7 @@ enum Owner { }; DECLARE_POSTFIX_INCREMENT(Owner) -static const uint MAX_LENGTH_PRESIDENT_NAME_CHARS = 31; ///< The maximum length of a president name in characters including '\0' +static const uint MAX_LENGTH_PRESIDENT_NAME_CHARS = 32; ///< The maximum length of a president name in characters including '\0' static const uint MAX_LENGTH_PRESIDENT_NAME_PIXELS = 94; ///< The maximum length of a president name in pixels static const uint MAX_LENGTH_COMPANY_NAME_CHARS = 32; ///< The maximum length of a company name in characters including '\0' static const uint MAX_LENGTH_COMPANY_NAME_PIXELS = 150; ///< The maximum length of a company name in pixels diff --git a/src/depot_type.h b/src/depot_type.h index ce23c57948..61ea123433 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_CHARS = 31; ///< The maximum length of a depot name in characters including '\0' +static const uint MAX_LENGTH_DEPOT_NAME_CHARS = 32; ///< 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 */ diff --git a/src/engine_type.h b/src/engine_type.h index 6fbede6abc..c37356be6b 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_CHARS = 31; ///< The maximum length of an engine name in characters including '\0' +static const uint MAX_LENGTH_ENGINE_NAME_CHARS = 32; ///< 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; diff --git a/src/group_type.h b/src/group_type.h index c078c199eb..db11bbaacb 100644 --- a/src/group_type.h +++ b/src/group_type.h @@ -18,7 +18,7 @@ static const GroupID ALL_GROUP = 0xFFFD; static const GroupID DEFAULT_GROUP = 0xFFFE; ///< ungrouped vehicles are in this group. static const GroupID INVALID_GROUP = 0xFFFF; -static const uint MAX_LENGTH_GROUP_NAME_CHARS = 31; ///< The maximum length of a group name in characters including '\0' +static const uint MAX_LENGTH_GROUP_NAME_CHARS = 32; ///< The maximum length of a group name in characters including '\0' static const uint MAX_LENGTH_GROUP_NAME_PIXELS = 150; ///< The maximum length of a group name in pixels struct Group; diff --git a/src/signs_type.h b/src/signs_type.h index 0e97802685..361059e055 100644 --- a/src/signs_type.h +++ b/src/signs_type.h @@ -17,7 +17,7 @@ struct Sign; static const SignID INVALID_SIGN = 0xFFFF; -static const uint MAX_LENGTH_SIGN_NAME_CHARS = 31; ///< The maximum length of a sign name in characters including '\0' +static const uint MAX_LENGTH_SIGN_NAME_CHARS = 32; ///< The maximum length of a sign name in characters including '\0' static const uint MAX_LENGTH_SIGN_NAME_PIXELS = 255; ///< The maximum length of a sign name in pixels #endif /* SIGNS_TYPE_H */ diff --git a/src/station_type.h b/src/station_type.h index 9b1bfc27a7..0fd0577e14 100644 --- a/src/station_type.h +++ b/src/station_type.h @@ -86,7 +86,7 @@ enum CatchmentArea { MAX_CATCHMENT = 10, ///< Maximum catchment for airports with "modified catchment" enabled }; -static const uint MAX_LENGTH_STATION_NAME_CHARS = 31; ///< The maximum length of a station name in characters including '\0' +static const uint MAX_LENGTH_STATION_NAME_CHARS = 32; ///< The maximum length of a station name in characters including '\0' static const uint MAX_LENGTH_STATION_NAME_PIXELS = 180; ///< The maximum length of a station name in pixels /** List of stations */ diff --git a/src/town_type.h b/src/town_type.h index 224df5ff99..0efc2268d9 100644 --- a/src/town_type.h +++ b/src/town_type.h @@ -105,7 +105,7 @@ enum TownFounding { /** It needs to be 8bits, because we save and load it as such */ typedef SimpleTinyEnumT TownFoundingByte; -static const uint MAX_LENGTH_TOWN_NAME_CHARS = 31; ///< The maximum length of a town name in characters including '\0' +static const uint MAX_LENGTH_TOWN_NAME_CHARS = 32; ///< The maximum length of a town name in characters including '\0' static const uint MAX_LENGTH_TOWN_NAME_PIXELS = 130; ///< The maximum length of a town name in pixels #endif /* TOWN_TYPE_H */ diff --git a/src/vehicle_type.h b/src/vehicle_type.h index 4c4f468cdc..4b4150a637 100644 --- a/src/vehicle_type.h +++ b/src/vehicle_type.h @@ -64,7 +64,7 @@ enum DepotCommand { DEPOT_COMMAND_MASK = 0xFU << 28, }; -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_CHARS = 32; ///< 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. */