mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #1114 from trigger-death/fix-tooltips
Fixed tooltip issue #1053
This commit is contained in:
commit
56c3647215
|
@ -1067,10 +1067,12 @@ static void input_update_tooltip(rct_window *w, int widgetIndex, int x, int y)
|
|||
RCT2_GLOBAL(RCT2_ADDRESS_TOOLTIP_TIMEOUT, uint16) = RCT2_GLOBAL(0x009DE588, uint16);
|
||||
|
||||
int bp = 2000;
|
||||
if (RCT2_GLOBAL(RCT2_ADDRESS_TOOLTIP_NOT_SHOWN_TICKS, uint16) <= 1000)
|
||||
if (RCT2_GLOBAL(RCT2_ADDRESS_TOOLTIP_NOT_SHOWN_TICKS, uint16) >= 1)
|
||||
bp = 0;
|
||||
if (bp > RCT2_GLOBAL(RCT2_ADDRESS_TOOLTIP_TIMEOUT, uint16))
|
||||
if (bp > RCT2_GLOBAL(RCT2_ADDRESS_TOOLTIP_TIMEOUT, uint16)) {
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_TOOLTIP_NOT_SHOWN_TICKS, sint16)++;
|
||||
return;
|
||||
}
|
||||
|
||||
window_tooltip_open(w, widgetIndex, x, y);
|
||||
// RCT2_CALLPROC_X(0x006EA10D, x, y, 0, widgetIndex, w, widget, 0); // window_tooltip_open();
|
||||
|
|
|
@ -140,7 +140,7 @@ void window_dispatch_update_all()
|
|||
rct_window *w;
|
||||
|
||||
RCT2_GLOBAL(0x01423604, sint32)++;
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_TOOLTIP_NOT_SHOWN_TICKS, sint16)++;
|
||||
//RCT2_GLOBAL(RCT2_ADDRESS_TOOLTIP_NOT_SHOWN_TICKS, sint16)++;
|
||||
for (w = RCT2_LAST_WINDOW; w >= g_window_list; w--)
|
||||
window_event_update_call(w);
|
||||
|
||||
|
|
Loading…
Reference in New Issue