OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- separation of static and map-local event handlers into separate lists.

Browse source 
Having everything lumped together made this a maintenance hassle because it affected how the level has to be stored.
This hasn't been tested yet, so it may not work as intended!
This commit is contained in:
Christoph Oelckers 2019-02-02 16:43:11 +01:00
commit 66eb4e5048
29 changed files with 240 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/win32/i_input.cpp
View file

@ -91,6 +91,7 @@
#include "events.h"
#include "doomerrors.h"
#include "i_system.h"
#include "g_levellocals.h"
// Prototypes and declarations.
#include "rawinput.h"
@ -177,7 +178,7 @@ static void I_CheckGUICapture ()
}
// [ZZ] check active event handlers that want the UI processing
if (!wantCapt && eventManager.CheckUiProcessors())
if (!wantCapt && primaryLevel->localEventManager->CheckUiProcessors())
wantCapt = true;
if (wantCapt != GUICapture)
@ -781,7 +782,7 @@ void I_StartTic ()
BlockMouseMove--;
ResetButtonTriggers ();
I_CheckGUICapture ();
EventHandlerResultForNativeMouse = eventManager.CheckRequireMouse();
EventHandlerResultForNativeMouse = primaryLevel->localEventManager->CheckRequireMouse();
I_CheckNativeMouse (false, EventHandlerResultForNativeMouse);
I_GetEvent ();
}