equal
deleted
inserted
replaced
3 #ifndef TREE_MAP_H |
3 #ifndef TREE_MAP_H |
4 #define TREE_MAP_H |
4 #define TREE_MAP_H |
5 |
5 |
6 #include "macros.h" |
6 #include "macros.h" |
7 |
7 |
8 typedef enum TreeType { |
8 enum TreeType { |
9 TREE_INVALID = -1, |
9 TREE_INVALID = -1, |
10 TREE_TEMPERATE = 0, |
10 TREE_TEMPERATE = 0, |
11 TREE_SUB_ARCTIC = 12, |
11 TREE_SUB_ARCTIC = 12, |
12 TREE_RAINFOREST = 20, |
12 TREE_RAINFOREST = 20, |
13 TREE_CACTUS = 27, |
13 TREE_CACTUS = 27, |
14 TREE_SUB_TROPICAL = 28, |
14 TREE_SUB_TROPICAL = 28, |
15 TREE_TOYLAND = 32 |
15 TREE_TOYLAND = 32 |
16 } TreeType; |
16 }; |
17 |
17 |
18 enum { |
18 enum { |
19 TREE_COUNT_TEMPERATE = TREE_SUB_ARCTIC - TREE_TEMPERATE, |
19 TREE_COUNT_TEMPERATE = TREE_SUB_ARCTIC - TREE_TEMPERATE, |
20 TREE_COUNT_SUB_ARCTIC = TREE_RAINFOREST - TREE_SUB_ARCTIC, |
20 TREE_COUNT_SUB_ARCTIC = TREE_RAINFOREST - TREE_SUB_ARCTIC, |
21 TREE_COUNT_RAINFOREST = TREE_CACTUS - TREE_RAINFOREST, |
21 TREE_COUNT_RAINFOREST = TREE_CACTUS - TREE_RAINFOREST, |
23 TREE_COUNT_TOYLAND = 9 |
23 TREE_COUNT_TOYLAND = 9 |
24 }; |
24 }; |
25 |
25 |
26 /* ground type, m2 bits 4...5 |
26 /* ground type, m2 bits 4...5 |
27 * valid densities (bits 6...7) in comments after the enum */ |
27 * valid densities (bits 6...7) in comments after the enum */ |
28 typedef enum TreeGround { |
28 enum TreeGround { |
29 TREE_GROUND_GRASS = 0, // 0 |
29 TREE_GROUND_GRASS = 0, // 0 |
30 TREE_GROUND_ROUGH = 1, // 0 |
30 TREE_GROUND_ROUGH = 1, // 0 |
31 TREE_GROUND_SNOW_DESERT = 2 // 0-3 for snow, 3 for desert |
31 TREE_GROUND_SNOW_DESERT = 2 // 0-3 for snow, 3 for desert |
32 } TreeGround; |
32 }; |
33 |
33 |
34 |
34 |
35 static inline TreeType GetTreeType(TileIndex t) |
35 static inline TreeType GetTreeType(TileIndex t) |
36 { |
36 { |
37 assert(IsTileType(t, MP_TREES)); |
37 assert(IsTileType(t, MP_TREES)); |