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

Merge pull request #4649 from zsilencer/multiplayer

Browse Source 
Guest+staff pickup and balloon pop commands
This commit is contained in:
Duncan
2016-10-20 12:46:27 +01:00
committed by GitHub
parent a572ecf477 d83df63acf
commit 81bb6cb950
16 changed files with 326 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interface/viewport_interaction.c
View File

@@ -135,7 +135,7 @@ int viewport_interaction_left_click(int x, int y)
if (game_is_not_paused()) {
switch (info.sprite->unknown.misc_identifier) {
case SPRITE_MISC_BALLOON:
balloon_press(&info.sprite->balloon);
game_do_command(info.sprite->balloon.sprite_index, GAME_COMMAND_FLAG_APPLY, 0, 0, GAME_COMMAND_BALLOON_PRESS, 0, 0);
break;
case SPRITE_MISC_DUCK:
duck_press(&info.sprite->duck);

3
src/interface/window.h
View File

@@ -734,6 +734,9 @@ void window_map_tooltip_update_visibility();
void window_staff_list_init_vars();
void game_command_callback_pickup_guest(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp);
void game_command_callback_pickup_staff(int eax, int ebx, int ecx, int edx, int esi, int edi, int ebp);
void window_event_close_call(rct_window* w);
void window_event_mouse_up_call(rct_window* w, int widgetIndex);
void window_event_resize_call(rct_window* w);