From 90568878a5981e5465d3e9ea01cb3b79b44d5c5d Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Wed, 7 Aug 2019 20:06:30 +0000 Subject: [PATCH] Allow MOUSEINACTIVECONDITIONAL when out of menu. Fixes left clicking screens. git-svn-id: https://svn.eduke32.com/eduke32@7899 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/menus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/duke3d/src/menus.h b/source/duke3d/src/menus.h index 17b85f13c..c29300795 100644 --- a/source/duke3d/src/menus.h +++ b/source/duke3d/src/menus.h @@ -486,7 +486,7 @@ extern int32_t m_mousewake_watchpoint, m_menuchange_watchpoint; # define CURSORALPHA (MOUSEUSEALPHA ? clamp((totalclock - m_mouselastactivity - 90)*2 + (255/3), (255/3), 255) : 255/3) # define MOUSEACTIVECONDITION (totalclock - m_mouselastactivity < M_MOUSETIMEOUT) # define MOUSEACTIVECONDITIONAL(condition) (MOUSEACTIVECONDITION && (condition)) -# define MOUSEINACTIVECONDITIONAL(condition) (!MOUSEACTIVECONDITION && (condition)) +# define MOUSEINACTIVECONDITIONAL(condition) ((!(g_player[myconnectindex].ps->gm & MODE_MENU) || !MOUSEACTIVECONDITION) && (condition)) # define MOUSEWATCHPOINTCONDITIONAL(condition) ((condition) || m_mousewake_watchpoint || m_menuchange_watchpoint == 3) #endif