mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into viewport-window

Browse Source 
Conflicts:
	projects/openrct2.vcxproj.filters
This commit is contained in:
IntelOrca
2014-10-12 17:28:17 +01:00
parent 9ebf6e5550 98b9f8ae91
commit f22cc6bbeb
13 changed files with 1024 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/interface/window.h
View File

@@ -481,6 +481,7 @@ void window_shortcut_keys_open();
void window_shortcut_change_open(int selected_key);
void window_guest_open(rct_peep* peep);
void window_staff_open(rct_peep* peep);
void window_staff_fire_prompt_open(rct_peep* peep);
void window_park_awards_open();
void window_park_entrance_open();
void window_park_guests_open();