mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 09:14:58 +01:00
Code Issues Releases Wiki Activity

Move staff and guest windows

Browse Source
This commit is contained in:
Marijn van der Werf
2017-10-06 23:21:00 +02:00
committed by Michał Janiszewski
parent 8569a7fe2f
commit eef3bd9af5
11 changed files with 137 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/interface/viewport_interaction.c
View File

@@ -131,8 +131,13 @@ sint32 viewport_interaction_left_click(sint32 x, sint32 y)
window_ride_open_vehicle(info.vehicle);
break;
case SPRITE_IDENTIFIER_PEEP:
window_guest_open(info.peep);
{
Intent * intent = intent_create(WC_PEEP);
intent_set_pointer(intent, INTENT_EXTRA_PEEP, info.peep);
context_open_intent(intent);
intent_release(intent);
break;
}
case SPRITE_IDENTIFIER_MISC:
if (game_is_not_paused()) {
switch (info.sprite->unknown.misc_identifier) {

4
src/openrct2/interface/window.h
View File

@@ -533,6 +533,7 @@ enum {
#define WC_WATER__WIDX_PREVIEW 3
#define WC_PEEP__WIDX_PATROL 11
#define WC_PEEP__WIDX_ACTION_LBL 12
#define WC_PEEP__WIDX_PICKUP 13
#define WC_TRACK_DESIGN_LIST__WIDX_ROTATE 5
#define WC_TRACK_DESIGN_PLACE__WIDX_ROTATE 3
#define WC_MAP__WIDX_LAND_TOOL 13
@@ -540,6 +541,7 @@ enum {
#define WC_EDITOR_OBJECT_SELECTION__WIDX_TAB_1 4
#define WC_CLEAR_SCENERY__WIDX_PREVIEW 3
#define WC_LAND_RIGHTS__WIDX_PREVIEW 3
#define WC_STAFF__WIDX_PICKUP 10
enum PROMPT_MODE {
PM_SAVE_BEFORE_LOAD = 0,
@@ -708,8 +710,6 @@ void window_top_toolbar_open();
void window_game_bottom_toolbar_open();
void window_game_bottom_toolbar_invalidate_news_item();
void window_track_list_open(ride_list_item item);
void window_guest_open(rct_peep* peep);
rct_window *window_staff_open(rct_peep* peep);
rct_window *window_ride_main_open(sint32 rideIndex);
rct_window *window_ride_open_station(sint32 rideIndex, sint32 stationIndex);
rct_window *window_ride_open_track(rct_map_element *mapElement);