1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00

Merge remote-tracking branch 'upstream/develop' into toggle-top-bottom-toolbar

This commit is contained in:
Maikel Stuivenberg
2015-06-28 12:06:47 +02:00
39 changed files with 9732 additions and 996 deletions

View File

@@ -126,4 +126,8 @@ void sub_68A15E(int screenX, int screenY, short *x, short *y, int *direction, rc
void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, int x, int y);
void sub_0x68615B(int ebp);
void sub_688485();
void sub_688217();
#endif

View File

@@ -564,7 +564,8 @@ rct_window *window_ride_open_vehicle(rct_vehicle *vehicle);
void window_ride_demolish_prompt_open(int rideIndex);
void window_ride_construct(rct_window *w);
void window_ride_list_open();
rct_window * window_construction_open();
rct_window *window_ride_construction_open();
rct_window *window_maze_construction_open();
void window_track_place_open();
rct_window *window_new_ride_open();
rct_window *window_new_ride_open_research();