Fix instant camera movement after closing the VGUI menu

FreeSlave · May 28, 2024 · f276c45 · f276c45
1 parent 951a95c
commit f276c45
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1 deletion.
diff --git a/cl_dll/input_goldsource.cpp b/cl_dll/input_goldsource.cpp
@@ -811,6 +811,11 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY)
 		mx = my = 0;
 	}
 
+	if (ignoreNextDelta)
+	{
+		ignoreNextDelta = false;
+		mx = my = 0;
+	}
 	if(pOutX) *pOutX = mx;
 	if(pOutY) *pOutY = my;
 }
@@ -1580,6 +1585,7 @@ IN_Init
 */
 void GoldSourceInput::IN_Init (void)
 {
+	ignoreNextDelta = false;
 	m_filter				= gEngfuncs.pfnRegisterVariable ( "m_filter","0", FCVAR_ARCHIVE );
 	sensitivity			 = gEngfuncs.pfnRegisterVariable ( "sensitivity","3", FCVAR_ARCHIVE ); // user mouse sensitivity setting.
 
@@ -1680,4 +1686,9 @@ void GoldSourceInput::IN_Init (void)
 	IN_StartupJoystick ();
 }
 
+void GoldSourceInput::IgnoreNextMouseDelta()
+{
+	ignoreNextDelta = true;
+}
+
 #endif
diff --git a/cl_dll/input_mouse.cpp b/cl_dll/input_mouse.cpp
@@ -87,7 +87,12 @@ void IN_ResetMouse()
 	currentInput->IN_ResetMouse();
 }
 
+void IgnoreNextMouseDelta()
+{
+	currentInput->IgnoreNextMouseDelta();
+}
+
 AbstractInput* CurrentMouseInput()
 {
-    return currentInput;
+	return currentInput;
 }
diff --git a/cl_dll/input_mouse.h b/cl_dll/input_mouse.h
@@ -21,6 +21,7 @@ class AbstractInput
 	virtual void IN_Init( void ) = 0;
 	virtual void IN_ResetMouse( void ) = 0;
 	virtual void Joy_AdvancedUpdate( void ) = 0;
+	virtual void IgnoreNextMouseDelta() = 0;
 };
 
 class FWGSInput : public AbstractInput
@@ -39,6 +40,7 @@ class FWGSInput : public AbstractInput
 	virtual void IN_Init( void );
 	virtual void IN_ResetMouse( void ) {}
 	virtual void Joy_AdvancedUpdate( void ) {}
+	virtual void IgnoreNextMouseDelta() {}
 
 protected:
 	float ac_forwardmove;
@@ -82,6 +84,7 @@ class GoldSourceInput : public AbstractInput
 	virtual void IN_Init( void );
 	virtual void IN_ResetMouse( void );
 	virtual void Joy_AdvancedUpdate( void );
+	virtual void IgnoreNextMouseDelta();
 
 protected:
 	void IN_GetMouseDelta( int *pOutX, int *pOutY);
@@ -98,6 +101,7 @@ class GoldSourceInput : public AbstractInput
 	int         old_mouse_x, old_mouse_y, mx_accum, my_accum;
 	int         mouseinitialized;
 	void* sdl2Lib;
+	bool ignoreNextDelta;
 };
 #endif
 

diff --git a/cl_dll/vgui_TeamFortressViewport.cpp b/cl_dll/vgui_TeamFortressViewport.cpp
@@ -58,6 +58,8 @@
 #include "screenfade.h"
 
 void IN_SetVisibleMouse(bool visible);
+void IgnoreNextMouseDelta();
+
 class CCommandMenu;
 
 // Scoreboard positions
@@ -1672,6 +1674,7 @@ void TeamFortressViewport::UpdateCursorState()
 	if( m_pSpectatorPanel->m_menuVisible || m_pCurrentMenu || m_pTeamMenu->isVisible() || GetClientVoiceMgr()->IsInSquelchMode() )
 	{
 		IN_SetVisibleMouse(true);
+		IgnoreNextMouseDelta();
 		App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::scu_arrow) );
 		return;
 	}
@@ -1681,6 +1684,7 @@ void TeamFortressViewport::UpdateCursorState()
 		if( gHUD.m_pCvarStealMouse->value != 0.0f )
 		{
 			IN_SetVisibleMouse(true);
+			IgnoreNextMouseDelta();
 			App::getInstance()->setCursorOveride( App::getInstance()->getScheme()->getCursor(Scheme::scu_arrow) );
 			return;
 		}

diff --git a/cl_dll/vgui_TeamFortressViewport.h b/cl_dll/vgui_TeamFortressViewport.h
@@ -1483,6 +1483,8 @@ class CTransparentPanel : public Panel
 	}
 };
 
+extern void IgnoreNextMouseDelta();
+
 //================================================================
 // Menu Panel that supports buffering of menus
 class CMenuPanel : public CTransparentPanel
@@ -1541,6 +1543,7 @@ class CMenuPanel : public CTransparentPanel
 
 	virtual void Close( void )
 	{
+		IgnoreNextMouseDelta();
 		setVisible( false );
 		m_iIsActive = false;