Fix a couple of window bugs

This commit is contained in:
ZedThree 2014-05-09 22:44:55 +02:00
parent 93d062704d
commit 2523b1f328
2 changed files with 6 additions and 5 deletions

View File

@ -208,9 +208,10 @@ static void window_game_top_toolbar_mouseup()
}
break;
case WIDX_SCENERY:
tool_set(w, WIDX_SCENERY, 0);
RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 6);
RCT2_CALLPROC_EBPSAFE(0x006E0FEF);
if (!tool_set(w, WIDX_SCENERY, 0)) {
RCT2_GLOBAL(0x009DE518, uint32) |= (1 << 6);
RCT2_CALLPROC_EBPSAFE(0x006E0FEF);
}
break;
case WIDX_PATH:
if (window_find_by_id(WC_FOOTPATH, 0) == NULL) {

View File

@ -142,7 +142,7 @@ void window_guest_list_open()
rct_window* window;
// Check if window is already open
window = window_bring_to_front_by_id(WC_RIDE_LIST, 0);
window = window_bring_to_front_by_id(WC_GUEST_LIST, 0);
if (window != NULL)
return;
@ -994,4 +994,4 @@ static int get_guest_face_sprite_large(rct_peep* peep){
}
return sprite;
}
}