mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into reorganise-src

Browse Source 
Conflicts:
	projects/openrct2.vcxproj
	src/interface/window.h
This commit is contained in:
IntelOrca
2014-10-07 20:07:15 +01:00
parent b828f678b8 b80abdc0c2
commit a32f73d27f
15 changed files with 481 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interface/window.h
View File

@@ -476,6 +476,8 @@ void window_staff_list_open();
void window_guest_list_open();
void window_map_open();
void window_options_open();
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_park_awards_open();