cpp/openttd-patchpack/source Changeset - r17050:29aadaa73fde

Changeset - r17050:29aadaa73fde

Parent rev.

Child rev.

[Not reviewed]

master

0 8 0

rubidium - 14 years ago 2011-01-14 22:08:40
rubidium@openttd.org

(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

8 files changed with 8 insertions and 8 deletions:

src/company_type.h

src/depot_type.h

src/engine_type.h

src/group_type.h

src/signs_type.h

src/station_type.h

src/town_type.h

src/vehicle_type.h

0 comments (0 inline, 0 general)

src/company_type.h

➞

Show inline comments

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

src/depot_type.h

➞

Show inline comments

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

src/engine_type.h

➞

Show inline comments

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

src/group_type.h

➞

Show inline comments

@@ @@ -18,7 +18,7 @@ static const GroupID ALL_GROUP = 0xF @@
 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;

src/signs_type.h

➞

Show inline comments

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

src/station_type.h

➞

Show inline comments

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

src/town_type.h

➞

Show inline comments

@@ @@ -105,7 +105,7 @@ enum TownFounding { @@
 /** It needs to be 8bits, because we save and load it as such */
 typedef SimpleTinyEnumT<TownFounding, byte> 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 */

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_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. */

0 comments (0 inline, 0 general)