diff --git a/src/events.cpp b/src/events.cpp index 80e8fc6c1..033d647b1 100755 --- a/src/events.cpp +++ b/src/events.cpp @@ -259,7 +259,7 @@ void EventManager::Shutdown() } } -#define DEFINE_EVENT_LOOPER(name, play) void EventManager::##name() \ +#define DEFINE_EVENT_LOOPER(name, play) void EventManager::name() \ { \ if (ShouldCallStatic(play)) staticEventManager.name(); \ for (DStaticEventHandler* handler = FirstEventHandler; handler; handler = handler->next) \ diff --git a/src/posix/cocoa/i_input.mm b/src/posix/cocoa/i_input.mm index 79315e1ce..7ae2050b4 100644 --- a/src/posix/cocoa/i_input.mm +++ b/src/posix/cocoa/i_input.mm @@ -46,6 +46,7 @@ #include "v_video.h" #include "events.h" #include "g_game.h" +#include "g_levellocals.h" EXTERN_CVAR(Int, m_use_mouse) @@ -92,7 +93,7 @@ void CheckGUICapture() : (MENU_On == menuactive || MENU_OnNoPause == menuactive); // [ZZ] check active event handlers that want the UI processing - if (!wantCapture && E_CheckUiProcessors()) + if (!wantCapture && primaryLevel->localEventManager->CheckUiProcessors()) { wantCapture = true; } @@ -197,7 +198,7 @@ void CheckNativeMouse() && (MENU_On == menuactive || MENU_OnNoPause == menuactive); } - if (!wantNative && E_CheckRequireMouse()) + if (!wantNative && primaryLevel->localEventManager->CheckRequireMouse()) wantNative = true; I_SetNativeMouse(wantNative); diff --git a/src/posix/sdl/i_input.cpp b/src/posix/sdl/i_input.cpp index 70a636dc6..61a1fe0be 100644 --- a/src/posix/sdl/i_input.cpp +++ b/src/posix/sdl/i_input.cpp @@ -45,6 +45,8 @@ #include "dikeys.h" #include "events.h" #include "g_game.h" +#include "g_levellocals.h" + static void I_CheckGUICapture (); static void I_CheckNativeMouse (); @@ -180,7 +182,7 @@ static void I_CheckGUICapture () } // [ZZ] check active event handlers that want the UI processing - if (!wantCapt && E_CheckUiProcessors()) + if (!wantCapt && primaryLevel->localEventManager->CheckUiProcessors()) wantCapt = true; if (wantCapt != GUICapture)