- Unraveled the want_native bit in I_CheckNativeMouse somewhat to ensure that it ends up false

when menuactive == MENU_WaitKey, even if you're not in a level.

SVN r3618 (trunk)
This commit is contained in:
Randy Heit 2012-05-04 02:16:19 +00:00
parent 1fec92c921
commit 9d4ba3c7fd

View file

@ -267,12 +267,19 @@ void I_CheckNativeMouse(bool preferNative)
} }
else else
{ {
want_native = if ((GetForegroundWindow() != Window) || preferNative || !use_mouse)
(GetForegroundWindow() != Window) || {
preferNative || want_native = true;
!use_mouse || }
((!m_use_mouse || menuactive != MENU_WaitKey) && else if (menuactive == MENU_WaitKey)
{
want_native = false;
}
else
{
want_native = ((!m_use_mouse || menuactive != MENU_WaitKey) &&
(!CaptureMode_InGame() || GUICapture || paused || demoplayback)); (!CaptureMode_InGame() || GUICapture || paused || demoplayback));
}
} }
//Printf ("%d %d %d\n", wantNative, preferNative, NativeMouse); //Printf ("%d %d %d\n", wantNative, preferNative, NativeMouse);