zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't change item selection with mouse while scanning for new key bind (#159)

Browse source 
# Conflicts:
#	.gitignore
This commit is contained in:
CommonLoon102 2019-09-08 13:24:21 +00:00 committed by Christoph Oelckers
parent d6d8762400
commit e8337c783e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -19,6 +19,9 @@ apps/
*.ppc *.ppc
*.app *.app
/movie
/blud*.png
/game*.sav
*.log *.log
*.cache *.cache
*.cfg *.cfg

2
source/blood/src/gamemenu.cpp
View file

@ -1176,7 +1176,7 @@ void CGameMenuItemKeyList::Draw(void)
int my = y<<16; int my = y<<16;
int mw = m_nWidth<<16; int mw = m_nWidth<<16;
int mh = height<<16; int mh = height<<16;
if (bEnable && MOUSEACTIVECONDITIONAL(!gGameMenuMgr.MouseOutsideBounds(&gGameMenuMgr.m_mousepos, mx, my, mw, mh))) if (!bScan && bEnable && MOUSEACTIVECONDITIONAL(!gGameMenuMgr.MouseOutsideBounds(&gGameMenuMgr.m_mousepos, mx, my, mw, mh)))
{ {
if (MOUSEWATCHPOINTCONDITIONAL(!gGameMenuMgr.MouseOutsideBounds(&gGameMenuMgr.m_prevmousepos, mx, my, mw, mh))) if (MOUSEWATCHPOINTCONDITIONAL(!gGameMenuMgr.MouseOutsideBounds(&gGameMenuMgr.m_prevmousepos, mx, my, mw, mh)))
{ {