mirror of https://github.com/OpenRCT2/OpenRCT2.git
Rebase onto develop and fix indentation
This commit is contained in:
parent
45df10dfd4
commit
a32aad2274
|
@ -46,11 +46,15 @@ enum
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const int SEGMENTS_ALL;
|
extern const int SEGMENTS_ALL;
|
||||||
|
extern const uint16 segment_offsets[9];
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
TUNNEL_0 = 0,
|
TUNNEL_0 = 0,
|
||||||
TUNNEL_6 = 6,
|
TUNNEL_6 = 6,
|
||||||
|
TUNNEL_7 = 7,
|
||||||
|
TUNNEL_8 = 8,
|
||||||
|
TUNNEL_14 = 0x0E
|
||||||
};
|
};
|
||||||
|
|
||||||
void paint_util_push_tunnel_left(uint16 height, uint8 type);
|
void paint_util_push_tunnel_left(uint16 height, uint8 type);
|
||||||
|
|
|
@ -32,6 +32,12 @@ extern const uint8 track_map_4x4[][16];
|
||||||
extern const uint8 edges_4x4[];
|
extern const uint8 edges_4x4[];
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
SPR_FLOOR_METAL = 14567,
|
||||||
|
SPR_FENCE_METAL_NE = 14568,
|
||||||
|
SPR_FENCE_METAL_SE = 14569,
|
||||||
|
SPR_FENCE_METAL_SW = 14570,
|
||||||
|
SPR_FENCE_METAL_NW = 14571,
|
||||||
|
|
||||||
SPR_FLOOR_CORK_SE_SW = 22134,
|
SPR_FLOOR_CORK_SE_SW = 22134,
|
||||||
SPR_FLOOR_CORK_SW = 22135,
|
SPR_FLOOR_CORK_SW = 22135,
|
||||||
SPR_FLOOR_CORK_SE = 22136,
|
SPR_FLOOR_CORK_SE = 22136,
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue