zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 12:32:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixes compilation of POSIX targets

Browse source 
src/posix/cocoa/i_input.mm:95:22: error: use of undeclared identifier 'E_CheckUiProcessors'
src/posix/cocoa/i_input.mm:200:21: error: use of undeclared identifier 'E_CheckRequireMouse'
src/posix/sdl/i_input.cpp:183:19: error: use of undeclared identifier 'E_CheckUiProcessors'
src/events.cpp:540:1: error: pasting formed '::RenderFrame', an invalid preprocessing token
src/events.cpp:541:1: error: pasting formed '::WorldLightning', an invalid preprocessing token
src/events.cpp:542:1: error: pasting formed '::WorldTick', an invalid preprocessing token
src/events.cpp:543:1: error: pasting formed '::UiTick', an invalid preprocessing token
src/events.cpp:544:1: error: pasting formed '::PostUiTick', an invalid preprocessing token
This commit is contained in:
alexey.lysiuk 2019-02-03 11:04:49 +02:00
parent 53162a8a5c
commit 8137162ca0
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/events.cpp
View file

@ -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) \

5
src/posix/cocoa/i_input.mm
View file

@ -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);

4
src/posix/sdl/i_input.cpp
View file

@ -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)