1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00

Named 2 input flags, and dropdown fix

Named INPUT_FLAG_1 to INPUT_FLAG_DROPDOWN_STAY_OPEN
Named INPUT_FLAG_2 to INPUT_FLAG_DROPDOWN_MOUSE_UP

placed RCT2_ADDRESS_INPUT_FLAGS where valid and replaced all bitwise
references to it with appropriate input flags.

Changed ride view dropdown to hold only as it should be.
This commit is contained in:
Robert Jordan
2015-05-07 14:31:11 -04:00
parent 1b269675d8
commit c25ef45827
21 changed files with 80 additions and 64 deletions

View File

@@ -29,6 +29,7 @@
#include "../world/map.h"
#include "../world/scenery.h"
#include "../world/sprite.h"
#include "../input.h"
#include "viewport.h"
static void viewport_interaction_remove_scenery(rct_map_element *mapElement, int x, int y);
@@ -264,7 +265,6 @@ int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info
return info->type;
}
if ((RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & 0x48) != 0x48)
if (window_find_by_class(WC_RIDE_CONSTRUCTION) == NULL && window_find_by_class(WC_FOOTPATH) == NULL)
return info->type = VIEWPORT_INTERACTION_ITEM_NONE;