cpp/openttd-patchpack/source Changeset - r25471:80843222b596

Changeset - r25471:80843222b596

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

frosch - 3 years ago 2021-05-13 13:45:07
frosch@openttd.org

Codechange: add constant for number of original cargoes.

2 files changed with 2 insertions and 1 deletions:

src/cargo_type.h

src/table/cargo_const.h

0 comments (0 inline, 0 general)

src/cargo_type.h

➞

Show inline comments

@@ @@ -58,12 +58,13 @@ enum CargoType { @@
 	CT_COLA         =  7,
 	CT_COTTON_CANDY =  8,
 	CT_BUBBLES      =  9,
 	CT_PLASTIC      = 10,
 	CT_FIZZY_DRINKS = 11,
 	NUM_ORIGINAL_CARGO = 12,
 	NUM_CARGO       = 64,   ///< Maximal number of cargo types in a game.
 	CT_AUTO_REFIT   = 0xFD, ///< Automatically choose cargo type when doing auto refitting.
 	CT_NO_REFIT     = 0xFE, ///< Do not refit cargo of a vehicle (used in vehicle orders and auto-replace/auto-new).
 	CT_INVALID      = 0xFF, ///< Invalid cargo type.
 };

src/table/cargo_const.h

➞

Show inline comments

@@ @@ -93,13 +93,13 @@ static const CargoSpec _default_cargo[] @@
 	/* Void slot in arctic */
 	MK(0xFF,      0, 184,  0, 0x100, 5120,  9, 255,  true,       TE_NONE,      NOTHING,      NOTHING,       STR_TONS, CC_NOAVAILABLE),
 };
 /** Table of cargo types available in each climate, by default */
-static const CargoLabel _default_climate_cargo[NUM_LANDSCAPE][12] = {
+static const CargoLabel _default_climate_cargo[NUM_LANDSCAPE][NUM_ORIGINAL_CARGO] = {
 	{ 'PASS', 'COAL', 'MAIL', 'OIL_', 'LVST', 'GOOD', 'GRAI', 'WOOD', 'IORE', 'STEL', 'VALU',     33, },
 	{ 'PASS', 'COAL', 'MAIL', 'OIL_', 'LVST', 'GOOD', 'WHEA', 'WOOD',     34, 'PAPR', 'GOLD', 'FOOD', },
 	{ 'PASS', 'RUBR', 'MAIL',      4, 'FRUT', 'GOOD', 'MAIZ',     11, 'CORE', 'WATR', 'DIAM', 'FOOD', },
 	{ 'PASS', 'SUGR', 'MAIL', 'TOYS', 'BATT', 'SWET', 'TOFF', 'COLA', 'CTCD', 'BUBL', 'PLST', 'FZDR', },
 };

0 comments (0 inline, 0 general)