Mercurial > hg > openttd
changeset 19004:50f5f856455b draft
(svn r23860) -Feature: [NewGRF] Add cargo property 1D to set the capacity multipliers when refitting vehicles, which do not use callback 15.
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Sat, 28 Jan 2012 12:08:03 +0000 |
| parents | 3effafcdac97 |
| children | aa8cbaa8b7ce |
| files | src/cargotype.cpp src/cargotype.h src/engine.cpp src/newgrf.cpp src/table/cargo_const.h |
| diffstat | 5 files changed, 51 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cargotype.cpp +++ b/src/cargotype.cpp @@ -38,7 +38,12 @@ /* Reset and disable all cargo types */ memset(CargoSpec::array, 0, sizeof(CargoSpec::array)); - for (CargoID i = 0; i < lengthof(CargoSpec::array); i++) CargoSpec::Get(i)->bitnum = INVALID_CARGO; + for (CargoID i = 0; i < lengthof(CargoSpec::array); i++) { + CargoSpec::Get(i)->bitnum = INVALID_CARGO; + + /* Set defaults for newer properties, which old GRFs do not know */ + CargoSpec::Get(i)->multiplier = 0x100; + } _cargo_mask = 0;
--- a/src/cargotype.h +++ b/src/cargotype.h @@ -59,6 +59,7 @@ uint8 legend_colour; uint8 rating_colour; uint8 weight; ///< Weight of a single unit of this cargo type in 1/16 ton (62.5 kg). + uint16 multiplier; ///< Capacity multiplier for vehicles. (8 fractional bits) uint16 initial_payment; uint8 transit_days[2];
--- a/src/engine.cpp +++ b/src/engine.cpp @@ -258,18 +258,9 @@ /* Apply multipliers depending on cargo- and vehicletype. * Note: This might change to become more consistent/flexible. */ if (this->type != VEH_SHIP && default_cargo != cargo_type) { - switch (default_cargo) { - case CT_PASSENGERS: break; - case CT_MAIL: - case CT_GOODS: capacity *= 2; break; - default: capacity *= 4; break; - } - switch (cargo_type) { - case CT_PASSENGERS: break; - case CT_MAIL: - case CT_GOODS: capacity /= 2; break; - default: capacity /= 4; break; - } + uint16 default_multiplier = CargoSpec::Get(default_cargo)->multiplier; + uint16 cargo_multiplier = CargoSpec::Get(cargo_type)->multiplier; + capacity = (capacity * cargo_multiplier + default_multiplier / 2) / default_multiplier; } return capacity;
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -2798,6 +2798,10 @@ cs->callback_mask = buf->ReadByte(); break; + case 0x1D: // Vehicle capacity muliplier + cs->multiplier = max<uint16>(1u, buf->ReadWord()); + break; + default: ret = CIR_UNKNOWN; break;
--- a/src/table/cargo_const.h +++ b/src/table/cargo_const.h @@ -10,155 +10,155 @@ /** @file cargo_const.h Table of all default cargo types */ /** Construction macro for a #CargoSpec structure. */ -#define MK(bt, label, c, e, f, g, h, fr, te, ks1, ks2, ks3, ks4, ks5, l, m) \ - {bt, label, c, c, e, f, {g, h}, fr, te, 0, 0, ks1, ks2, ks3, ks4, ks5, l, m, NULL, NULL, 0} +#define MK(bt, label, c, e, f, g, h, fr, te, ks1, ks2, ks3, ks4, ks5, l, m, cmult) \ + {bt, label, c, c, e, cmult, f, {g, h}, fr, te, 0, 0, ks1, ks2, ks3, ks4, ks5, l, m, NULL, NULL, 0} /** Cargo types available by default. */ static const CargoSpec _default_cargo[] = { MK( 0, 'PASS', 152, 1, 3185, 0, 24, false, TE_PASSENGERS, STR_CARGO_PLURAL_PASSENGERS, STR_CARGO_SINGULAR_PASSENGER, STR_PASSENGERS, STR_QUANTITY_PASSENGERS, STR_ABBREV_PASSENGERS, - SPR_CARGO_PASSENGER, CC_PASSENGERS ), + SPR_CARGO_PASSENGER, CC_PASSENGERS, 0x400), MK( 1, 'COAL', 6, 16, 5916, 7, 255, true, TE_NONE, STR_CARGO_PLURAL_COAL, STR_CARGO_SINGULAR_COAL, STR_TONS, STR_QUANTITY_COAL, STR_ABBREV_COAL, - SPR_CARGO_COAL, CC_BULK ), + SPR_CARGO_COAL, CC_BULK, 0x100), MK( 2, 'MAIL', 15, 4, 4550, 20, 90, false, TE_MAIL, STR_CARGO_PLURAL_MAIL, STR_CARGO_SINGULAR_MAIL, STR_BAGS, STR_QUANTITY_MAIL, STR_ABBREV_MAIL, - SPR_CARGO_MAIL, CC_MAIL ), + SPR_CARGO_MAIL, CC_MAIL, 0x200), /* Oil in temperate and arctic */ MK( 3, 'OIL_', 174, 16, 4437, 25, 255, true, TE_NONE, STR_CARGO_PLURAL_OIL, STR_CARGO_SINGULAR_OIL, STR_LITERS, STR_QUANTITY_OIL, STR_ABBREV_OIL, - SPR_CARGO_OIL, CC_LIQUID ), + SPR_CARGO_OIL, CC_LIQUID, 0x100), /* Oil in subtropic */ MK( 3, 'OIL_', 174, 16, 4892, 25, 255, true, TE_NONE, STR_CARGO_PLURAL_OIL, STR_CARGO_SINGULAR_OIL, STR_LITERS, STR_QUANTITY_OIL, STR_ABBREV_OIL, - SPR_CARGO_OIL, CC_LIQUID ), + SPR_CARGO_OIL, CC_LIQUID, 0x100), MK( 4, 'LVST', 208, 3, 4322, 4, 18, true, TE_NONE, STR_CARGO_PLURAL_LIVESTOCK, STR_CARGO_SINGULAR_LIVESTOCK, STR_ITEMS, STR_QUANTITY_LIVESTOCK, STR_ABBREV_LIVESTOCK, - SPR_CARGO_LIVESTOCK, CC_PIECE_GOODS ), + SPR_CARGO_LIVESTOCK, CC_PIECE_GOODS, 0x100), MK( 5, 'GOOD', 194, 8, 6144, 5, 28, true, TE_GOODS, STR_CARGO_PLURAL_GOODS, STR_CARGO_SINGULAR_GOODS, STR_CRATES, STR_QUANTITY_GOODS, STR_ABBREV_GOODS, - SPR_CARGO_GOODS, CC_EXPRESS ), + SPR_CARGO_GOODS, CC_EXPRESS, 0x200), MK( 6, 'GRAI', 191, 16, 4778, 4, 40, true, TE_NONE, STR_CARGO_PLURAL_GRAIN, STR_CARGO_SINGULAR_GRAIN, STR_TONS, STR_QUANTITY_GRAIN, STR_ABBREV_GRAIN, - SPR_CARGO_GRAIN, CC_BULK ), + SPR_CARGO_GRAIN, CC_BULK, 0x100), MK( 6, 'WHEA', 191, 16, 4778, 4, 40, true, TE_NONE, STR_CARGO_PLURAL_WHEAT, STR_CARGO_SINGULAR_WHEAT, STR_TONS, STR_QUANTITY_WHEAT, STR_ABBREV_WHEAT, - SPR_CARGO_GRAIN, CC_BULK ), + SPR_CARGO_GRAIN, CC_BULK, 0x100), MK( 6, 'MAIZ', 191, 16, 4322, 4, 40, true, TE_NONE, STR_CARGO_PLURAL_MAIZE, STR_CARGO_SINGULAR_MAIZE, STR_TONS, STR_QUANTITY_MAIZE, STR_ABBREV_MAIZE, - SPR_CARGO_GRAIN, CC_BULK ), + SPR_CARGO_GRAIN, CC_BULK, 0x100), /* Wood in temperate and arctic */ MK( 7, 'WOOD', 84, 16, 5005, 15, 255, true, TE_NONE, STR_CARGO_PLURAL_WOOD, STR_CARGO_SINGULAR_WOOD, STR_TONS, STR_QUANTITY_WOOD, STR_ABBREV_WOOD, - SPR_CARGO_WOOD, CC_PIECE_GOODS ), + SPR_CARGO_WOOD, CC_PIECE_GOODS, 0x100), /* Wood in subtropic */ MK( 7, 'WOOD', 84, 16, 7964, 15, 255, true, TE_NONE, STR_CARGO_PLURAL_WOOD, STR_CARGO_SINGULAR_WOOD, STR_TONS, STR_QUANTITY_WOOD, STR_ABBREV_WOOD, - SPR_CARGO_WOOD, CC_PIECE_GOODS ), + SPR_CARGO_WOOD, CC_PIECE_GOODS, 0x100), MK( 8, 'IORE', 184, 16, 5120, 9, 255, true, TE_NONE, STR_CARGO_PLURAL_IRON_ORE, STR_CARGO_SINGULAR_IRON_ORE, STR_TONS, STR_QUANTITY_IRON_ORE, STR_ABBREV_IRON_ORE, - SPR_CARGO_IRON_ORE, CC_BULK ), + SPR_CARGO_IRON_ORE, CC_BULK, 0x100), MK( 9, 'STEL', 10, 16, 5688, 7, 255, true, TE_NONE, STR_CARGO_PLURAL_STEEL, STR_CARGO_SINGULAR_STEEL, STR_TONS, STR_QUANTITY_STEEL, STR_ABBREV_STEEL, - SPR_CARGO_STEEL, CC_PIECE_GOODS ), + SPR_CARGO_STEEL, CC_PIECE_GOODS, 0x100), MK( 10, 'VALU', 202, 2, 7509, 1, 32, true, TE_NONE, STR_CARGO_PLURAL_VALUABLES, STR_CARGO_SINGULAR_VALUABLES, STR_BAGS, STR_QUANTITY_VALUABLES, STR_ABBREV_VALUABLES, - SPR_CARGO_VALUES_GOLD, CC_ARMOURED ), + SPR_CARGO_VALUES_GOLD, CC_ARMOURED, 0x100), MK( 10, 'GOLD', 202, 8, 5802, 10, 40, true, TE_NONE, STR_CARGO_PLURAL_GOLD, STR_CARGO_SINGULAR_GOLD, STR_BAGS, STR_QUANTITY_GOLD, STR_ABBREV_GOLD, - SPR_CARGO_VALUES_GOLD, CC_ARMOURED ), + SPR_CARGO_VALUES_GOLD, CC_ARMOURED, 0x100), MK( 10, 'DIAM', 202, 2, 5802, 10, 255, true, TE_NONE, STR_CARGO_PLURAL_DIAMONDS, STR_CARGO_SINGULAR_DIAMOND, STR_BAGS, STR_QUANTITY_DIAMONDS, STR_ABBREV_DIAMONDS, - SPR_CARGO_DIAMONDS, CC_ARMOURED ), + SPR_CARGO_DIAMONDS, CC_ARMOURED, 0x100), MK( 11, 'PAPR', 10, 16, 5461, 7, 60, true, TE_NONE, STR_CARGO_PLURAL_PAPER, STR_CARGO_SINGULAR_PAPER, STR_TONS, STR_QUANTITY_PAPER, STR_ABBREV_PAPER, - SPR_CARGO_PAPER, CC_PIECE_GOODS ), + SPR_CARGO_PAPER, CC_PIECE_GOODS, 0x100), MK( 12, 'FOOD', 48, 16, 5688, 0, 30, true, TE_FOOD, STR_CARGO_PLURAL_FOOD, STR_CARGO_SINGULAR_FOOD, STR_TONS, STR_QUANTITY_FOOD, STR_ABBREV_FOOD, - SPR_CARGO_FOOD, CC_EXPRESS | CC_REFRIGERATED), + SPR_CARGO_FOOD, CC_EXPRESS | CC_REFRIGERATED, 0x100), MK( 13, 'FRUT', 208, 16, 4209, 0, 15, true, TE_NONE, STR_CARGO_PLURAL_FRUIT, STR_CARGO_SINGULAR_FRUIT, STR_TONS, STR_QUANTITY_FRUIT, STR_ABBREV_FRUIT, - SPR_CARGO_FRUIT, CC_BULK | CC_REFRIGERATED), + SPR_CARGO_FRUIT, CC_BULK | CC_REFRIGERATED, 0x100), MK( 14, 'CORE', 184, 16, 4892, 12, 255, true, TE_NONE, STR_CARGO_PLURAL_COPPER_ORE, STR_CARGO_SINGULAR_COPPER_ORE, STR_TONS, STR_QUANTITY_COPPER_ORE, STR_ABBREV_COPPER_ORE, - SPR_CARGO_COPPER_ORE, CC_BULK ), + SPR_CARGO_COPPER_ORE, CC_BULK, 0x100), MK( 15, 'WATR', 10, 16, 4664, 20, 80, true, TE_WATER, STR_CARGO_PLURAL_WATER, STR_CARGO_SINGULAR_WATER, STR_LITERS, STR_QUANTITY_WATER, STR_ABBREV_WATER, - SPR_CARGO_WATERCOLA, CC_LIQUID ), + SPR_CARGO_WATERCOLA, CC_LIQUID, 0x100), MK( 16, 'RUBR', 6, 16, 4437, 2, 20, true, TE_NONE, STR_CARGO_PLURAL_RUBBER, STR_CARGO_SINGULAR_RUBBER, STR_LITERS, STR_QUANTITY_RUBBER, STR_ABBREV_RUBBER, - SPR_CARGO_RUBBER, CC_LIQUID ), + SPR_CARGO_RUBBER, CC_LIQUID, 0x100), MK( 17, 'SUGR', 6, 16, 4437, 20, 255, true, TE_NONE, STR_CARGO_PLURAL_SUGAR, STR_CARGO_SINGULAR_SUGAR, STR_TONS, STR_QUANTITY_SUGAR, STR_ABBREV_SUGAR, - SPR_CARGO_SUGAR, CC_BULK ), + SPR_CARGO_SUGAR, CC_BULK, 0x100), MK( 18, 'TOYS', 174, 2, 5574, 25, 255, true, TE_NONE, STR_CARGO_PLURAL_TOYS, STR_CARGO_SINGULAR_TOY, STR_ITEMS, STR_QUANTITY_TOYS, STR_ABBREV_TOYS, - SPR_CARGO_TOYS, CC_PIECE_GOODS ), + SPR_CARGO_TOYS, CC_PIECE_GOODS, 0x100), MK( 19, 'BATT', 208, 4, 4322, 2, 30, true, TE_NONE, STR_CARGO_PLURAL_BATTERIES, STR_CARGO_SINGULAR_BATTERY, STR_ITEMS, STR_QUANTITY_BATTERIES, STR_ABBREV_BATTERIES, - SPR_CARGO_BATTERIES, CC_PIECE_GOODS ), + SPR_CARGO_BATTERIES, CC_PIECE_GOODS, 0x100), MK( 20, 'SWET', 194, 5, 6144, 8, 40, true, TE_GOODS, STR_CARGO_PLURAL_CANDY, STR_CARGO_SINGULAR_CANDY, STR_BAGS, STR_QUANTITY_SWEETS, STR_ABBREV_SWEETS, - SPR_CARGO_CANDY, CC_EXPRESS ), + SPR_CARGO_CANDY, CC_EXPRESS, 0x100), MK( 21, 'TOFF', 191, 16, 4778, 14, 60, true, TE_NONE, STR_CARGO_PLURAL_TOFFEE, STR_CARGO_SINGULAR_TOFFEE, STR_TONS, STR_QUANTITY_TOFFEE, STR_ABBREV_TOFFEE, - SPR_CARGO_TOFFEE, CC_BULK ), + SPR_CARGO_TOFFEE, CC_BULK, 0x100), MK( 22, 'COLA', 84, 16, 4892, 5, 75, true, TE_NONE, STR_CARGO_PLURAL_COLA, STR_CARGO_SINGULAR_COLA, STR_LITERS, STR_QUANTITY_COLA, STR_ABBREV_COLA, - SPR_CARGO_WATERCOLA, CC_LIQUID ), + SPR_CARGO_WATERCOLA, CC_LIQUID, 0x100), MK( 23, 'CTCD', 184, 16, 5005, 10, 25, true, TE_NONE, STR_CARGO_PLURAL_COTTON_CANDY, STR_CARGO_SINGULAR_COTTON_CANDY, STR_TONS, STR_QUANTITY_CANDYFLOSS, STR_ABBREV_CANDYFLOSS, - SPR_CARGO_COTTONCANDY, CC_BULK ), + SPR_CARGO_COTTONCANDY, CC_BULK, 0x100), MK( 24, 'BUBL', 10, 1, 5077, 20, 80, true, TE_NONE, STR_CARGO_PLURAL_BUBBLES, STR_CARGO_SINGULAR_BUBBLE, STR_ITEMS, STR_QUANTITY_BUBBLES, STR_ABBREV_BUBBLES, - SPR_CARGO_BUBBLES, CC_PIECE_GOODS ), + SPR_CARGO_BUBBLES, CC_PIECE_GOODS, 0x100), MK( 25, 'PLST', 202, 16, 4664, 30, 255, true, TE_NONE, STR_CARGO_PLURAL_PLASTIC, STR_CARGO_SINGULAR_PLASTIC, STR_LITERS, STR_QUANTITY_PLASTIC, STR_ABBREV_PLASTIC, - SPR_CARGO_PLASTIC, CC_LIQUID ), + SPR_CARGO_PLASTIC, CC_LIQUID, 0x100), MK( 26, 'FZDR', 48, 2, 6250, 30, 50, true, TE_FOOD, STR_CARGO_PLURAL_FIZZY_DRINKS, STR_CARGO_SINGULAR_FIZZY_DRINK, STR_ITEMS, STR_QUANTITY_FIZZY_DRINKS, STR_ABBREV_FIZZY_DRINKS, - SPR_CARGO_FIZZYDRINK, CC_PIECE_GOODS ), + SPR_CARGO_FIZZYDRINK, CC_PIECE_GOODS, 0x100), /* Void slot in temperate */ MK( 0xFF, 0, 1, 0, 5688, 0, 30, true, TE_NONE, STR_CARGO_PLURAL_NOTHING, STR_CARGO_SINGULAR_NOTHING, STR_TONS, STR_QUANTITY_NOTHING, STR_ABBREV_NOTHING, - SPR_ASCII_SPACE, CC_NOAVAILABLE ), + SPR_ASCII_SPACE, CC_NOAVAILABLE, 0x100), /* Void slot in arctic */ MK( 0xFF, 0, 184, 0, 5120, 9, 255, true, TE_NONE, STR_CARGO_PLURAL_NOTHING, STR_CARGO_SINGULAR_NOTHING, STR_TONS, STR_QUANTITY_NOTHING, STR_ABBREV_NOTHING, - SPR_ASCII_SPACE, CC_NOAVAILABLE ), + SPR_ASCII_SPACE, CC_NOAVAILABLE, 0x100), };