equal
deleted
inserted
replaced
5 #ifndef CARGOTYPE_H |
5 #ifndef CARGOTYPE_H |
6 #define CARGOTYPE_H |
6 #define CARGOTYPE_H |
7 |
7 |
8 #include "cargo_type.h" |
8 #include "cargo_type.h" |
9 #include "gfx_type.h" |
9 #include "gfx_type.h" |
10 #include "strings_type.h" |
10 #include "newgrf_string_type.h" |
11 |
11 |
12 typedef uint32 CargoLabel; |
12 typedef uint32 CargoLabel; |
13 |
13 |
14 enum TownEffect { |
14 enum TownEffect { |
15 TE_NONE, |
15 TE_NONE, |
34 bool is_freight; |
34 bool is_freight; |
35 TownEffect town_effect; ///< The effect this cargo type has on towns |
35 TownEffect town_effect; ///< The effect this cargo type has on towns |
36 uint16 multipliertowngrowth; |
36 uint16 multipliertowngrowth; |
37 uint8 callback_mask; |
37 uint8 callback_mask; |
38 |
38 |
39 StringID name; |
39 GRFMappedStringID name; |
40 StringID name_single; |
40 GRFMappedStringID name_single; |
41 StringID units_volume; |
41 GRFMappedStringID units_volume; |
42 StringID quantifier; |
42 GRFMappedStringID quantifier; |
43 StringID abbrev; |
43 GRFMappedStringID abbrev; |
44 |
44 |
45 SpriteID sprite; |
45 SpriteID sprite; |
46 |
46 |
47 uint16 classes; |
47 uint16 classes; |
48 const struct SpriteGroup *group; |
48 const struct SpriteGroup *group; |