Merge pull request #787 from WALLOFJUSTICE/dev-23-aug

* fix mouse clicks in splitscreen causing events on other players who…
TurningWheel · Sep 16, 2023 · 0bb5c22 · 0bb5c22
2 parents c912c00 + 1d3bef3
commit 0bb5c22
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/interface/bookgui.cpp b/src/interface/bookgui.cpp
@@ -311,7 +311,8 @@ void Player::BookGUI_t::updateBookGUI()
 	auto nextPageBoundary = innerFrame->findFrame("next page mouse boundary");
 
 	// book gui
-	if ( Input::inputs[player.playernum].binaryToggle("MenuLeftClick") )
+	if ( Input::inputs[player.playernum].binaryToggle("MenuLeftClick")
+		&& inputs.bPlayerUsingKeyboardControl(player.playernum) )
 	{
 		//book_t GUI next page button.
 		if ( nextPageBoundary->capturesMouse() )

diff --git a/src/interface/playerinventory.cpp b/src/interface/playerinventory.cpp
@@ -3262,8 +3262,8 @@ void releaseItem(const int player)
 	bool& toggleclick = inputs.getUIInteraction(player)->toggleclick;
 
 	// releasing items
-	if ( (!Input::inputs[player].binary("MenuLeftClick") && !toggleclick)
-		|| (Input::inputs[player].binaryToggle("MenuLeftClick") && toggleclick)
+	if ( (!Input::inputs[player].binary("MenuLeftClick") && inputs.bPlayerUsingKeyboardControl(player) && !toggleclick)
+		|| (Input::inputs[player].binaryToggle("MenuLeftClick") && inputs.bPlayerUsingKeyboardControl(player) && toggleclick)
 		|| ( (Input::inputs[player].binaryToggle(getContextMenuOptionBindingName(player, PROMPT_GRAB).c_str())
 			|| Input::inputs[player].binaryToggle("MenuConfirm")) 
 			&& toggleclick) )

diff --git a/src/ui/GameUI.cpp b/src/ui/GameUI.cpp
@@ -5765,7 +5765,7 @@ void Player::HUD_t::updateStatusEffectFocusedWindow()
 		}
 		if ( inputs.getVirtualMouse(player.playernum)->draw_cursor )
 		{
-			if ( Input::inputs[player.playernum].binaryToggle("MenuLeftClick") )
+			if ( Input::inputs[player.playernum].binaryToggle("MenuLeftClick") && inputs.bPlayerUsingKeyboardControl(player.playernum) )
 			{
 				Input::inputs[player.playernum].consumeBinaryToggle("MenuLeftClick");
 				if ( !bgFrame->capturesMouse() )
@@ -32283,7 +32283,7 @@ void Player::SkillSheet_t::processSkillSheet()
 								skillSlideDirection = -1;
 							}
 						}
-						if ( Input::inputs[player.playernum].binaryToggle("MenuLeftClick") )
+						if ( Input::inputs[player.playernum].binaryToggle("MenuLeftClick") && inputs.bPlayerUsingKeyboardControl(player.playernum) )
 						{
 							selectSkill(i);
 							Input::inputs[player.playernum].consumeBinaryToggle("MenuLeftClick");