mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rebase onto develop and fix indentation

This commit is contained in:
Marijn van der Werf 2016-05-18 23:28:13 +02:00
parent 45df10dfd4
commit a32aad2274
3 changed files with 411 additions and 600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/paint/map_element/map_element.h
View File

@ -46,11 +46,15 @@ enum
};
extern const int SEGMENTS_ALL;
extern const uint16 segment_offsets[9];
enum
{
TUNNEL_0 = 0,
TUNNEL_6 = 6,
TUNNEL_7 = 7,
TUNNEL_8 = 8,
TUNNEL_14 = 0x0E
};
void paint_util_push_tunnel_left(uint16 height, uint8 type);

6
src/ride/track_paint.h
View File

@ -32,6 +32,12 @@ extern const uint8 track_map_4x4[][16];
extern const uint8 edges_4x4[];
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_SW = 22135,
SPR_FLOOR_CORK_SE = 22136,

1001
src/ride/transport/chairlift.c
View File

File diff suppressed because it is too large Load Diff