Fix player weapons still receiving input when starting to use a func_…

…tank ValveSoftware/halflife#3345
twhl-community · Apr 1, 2023 · 4fe7e6e · 4fe7e6e
1 parent 49300de
commit 4fe7e6e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Fixed Gauss gun sometimes settting player uranium ammo to -1 (halflife issue [#3343](https://github.com/ValveSoftware/halflife/issues/3343))
 * Fixed pistol not playing empty sound when using secondary attack
 * Fixed user interface coordinates and sizes being incorrectly adjusted for resolution (halflife issue [#3344](https://github.com/ValveSoftware/halflife/issues/3344))
+* Fixed player weapons still receiving input when starting to use a func_tank (halflife issue [#3345](https://github.com/ValveSoftware/halflife/issues/3345)) (Thanks Oxofemple.)
 
 ## Changes in V1.0.0 Beta 014
 

diff --git a/dlls/player.cpp b/dlls/player.cpp
@@ -3839,6 +3839,10 @@ void CBasePlayer::ItemPostFrame()
 
 	ImpulseCommands();
 
+	// check again if the player is using a tank if they started using it in PlayerUse
+	if (m_pTank != NULL)
+		return;
+
 	if (!m_pActiveItem)
 		return;