- a few more fixes.

This commit is contained in:
Christoph Oelckers 2020-04-22 21:46:22 +02:00
parent 4da2351671
commit 7f83b190cc
4 changed files with 6 additions and 1 deletions

View file

@ -162,7 +162,7 @@ void CheckNativeMouse()
&& (MENU_On == menuactive || MENU_OnNoPause == menuactive);
}
if (!wantNative && primaryLevel->localEventManager->CheckRequireMouse())
if (!wantNative && sysCallbacks && sysCallbacks->WantNativeMouse && sysCallbacks->WantNativeMouse())
wantNative = true;
I_SetNativeMouse(wantNative);

View file

@ -39,6 +39,7 @@
#include "st_console.h"
#include "st_start.h"
#include "printf.h"
#include "engineerrors.h"
FStartupScreen *StartScreen;

View file

@ -243,6 +243,9 @@ static void I_CheckNativeMouse ()
bool captureModeInGame = sysCallbacks && sysCallbacks->CaptureModeInGame && sysCallbacks->CaptureModeInGame();
bool wantNative = !focus || (!use_mouse || GUICapture || !captureModeInGame);
if (!wantNative && sysCallbacks && sysCallbacks->WantNativeMouse && sysCallbacks->WantNativeMouse())
wantNative = true;
if (wantNative != NativeMouse)
{
NativeMouse = wantNative;

View file

@ -53,6 +53,7 @@
#include "cmdlib.h"
#include "m_argv.h"
#include "i_sound.h"
#include "i_interface.h"
#ifndef NO_GTK