eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mouse clicking around interface if IFACE_BAR_MODE is enabled (#12) 

See #3
This commit is contained in:
Jan Šimek 2022-05-23 12:24:05 -07:00 committed by GitHub
parent c634499a87
commit 03b5771e8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/game_mouse.cc
View File

@ -831,6 +831,22 @@ void gameMouseRefresh()
}
}
bool gameMouseClickOnInterfaceBar()
{
Rect interfaceBarWindowRect;
windowGetRect(gInterfaceBarWindow, &interfaceBarWindowRect);
int interfaceBarWindowRectLeft = 0;
int interfaceBarWindowRectRight = _scr_size.right;
if (gInterfaceBarMode) {
interfaceBarWindowRectLeft = interfaceBarWindowRect.left;
interfaceBarWindowRectRight = interfaceBarWindowRect.right;
}
return _mouse_click_in(interfaceBarWindowRectLeft, interfaceBarWindowRect.top, interfaceBarWindowRectRight, interfaceBarWindowRect.bottom);
}
// 0x44BFA8
void _gmouse_handle_event(int mouseX, int mouseY, int mouseState)
{
@ -852,8 +868,7 @@ void _gmouse_handle_event(int mouseX, int mouseY, int mouseState)
}
}
// TODO: allow clicking to the left and right of the INTERFACE_BAR if gInterfaceBarMode is enabled
if (!_mouse_click_in(0, 0, _scr_size.right - _scr_size.left, _scr_size.bottom - _scr_size.top - INTERFACE_BAR_HEIGHT)) {
if (gameMouseClickOnInterfaceBar()) {
return;
}

1
src/game_mouse.h
View File

@ -186,5 +186,6 @@ int _gmouse_3d_move_to(int x, int y, int elevation, Rect* a4);
int gameMouseHandleScrolling(int x, int y, int cursor);
void _gmouse_remove_item_outline(Object* object);
int objectIsDoor(Object* object);
bool gameMouseClickOnInterfaceBar();
#endif /* GAME_MOUSE_H */