Do not fire the secondary pistol when pressing grip

fholger · Jan 24, 2025 · 910ab93 · 910ab93
1 parent fb86d91
commit 910ab93
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Code/PlayerInput.cpp b/Code/PlayerInput.cpp
@@ -555,7 +555,7 @@ void CPlayerInput::OnAction( const ActionId& actionId, int activationMode, float
 		gEnv->pScriptSystem->ReleaseFunc(scriptOnAction);
 	}
 
-	if (filterOut && hudFilterOut && !m_pPlayer->WasEntityUsed() && (actionId == actions.use || actionId == actions.xi_use))
+	if (filterOut && hudFilterOut && !m_pPlayer->WasEntityUsed() && actionId == actions.xi_use)
 	{
 		// reinterpret as potential attack for dual wield weapon
 		OnAction(actions.attack2, activationMode, value);

diff --git a/Code/VR/OpenXRInput.cpp b/Code/VR/OpenXRInput.cpp
@@ -131,6 +131,7 @@ void OpenXRInput::Shutdown()
 	DestroyAction(m_binoculars.handle);
 	DestroyAction(m_nextWeapon.handle);
 	DestroyAction(m_use.handle);
+	DestroyAction(m_gripUse.handle);
 	DestroyAction(m_nightvision.handle);
 	DestroyAction(m_melee.handle);
 	DestroyAction(m_grenades.handle);
@@ -318,6 +319,7 @@ void OpenXRInput::CreateInputActions()
 	CreateBooleanAction(m_ingameSet, m_reload, "reload", "Reload", &g_pGameActions->reload, &g_pGameActions->firemode);
 	CreateBooleanAction(m_ingameSet, m_nextWeapon, "next_weapon", "Next Weapon", &g_pGameActions->nextitem, nullptr, false);
 	CreateBooleanAction(m_ingameSet, m_use, "use", "Use", &g_pGameActions->xi_use);
+	CreateBooleanAction(m_ingameSet, m_gripUse, "grip_use", "Grip/Use", &g_pGameActions->use);
 	CreateBooleanAction(m_ingameSet, m_binoculars, "binoculars", "Binoculars", &g_pGameActions->xi_binoculars);
 	CreateBooleanAction(m_ingameSet, m_nightvision, "nightvision", "Nightvision", &g_pGameActions->hud_night_vision);
 	CreateBooleanAction(m_ingameSet, m_melee, "melee", "Melee Attack", &g_pGameActions->special);
@@ -409,7 +411,7 @@ void OpenXRInput::SuggestBindings()
 	touch.AddBinding(m_suitMenu.handle, "/user/hand/<!movement>/input/thumbstick/click");
 	touch.AddBinding(m_nextWeapon.handle, "/user/hand/<weapon>/input/squeeze");
 	touch.AddBinding(m_use.handle, "/user/hand/<!weapon>/input/trigger");
-	touch.AddBinding(m_use.handle, "/user/hand/<!weapon>/input/squeeze");
+	touch.AddBinding(m_gripUse.handle, "/user/hand/<!weapon>/input/squeeze");
 	touch.AddBinding(m_binoculars.handle, "/user/hand/<!weapon>/input/a");
 	touch.AddBinding(m_grenades.handle, "/user/hand/<weapon>/input/b");
 	touch.AddBinding(m_menuClick.handle, "/user/hand/<weapon>/input/trigger");
@@ -447,7 +449,7 @@ void OpenXRInput::SuggestBindings()
 	knuckles.AddBinding(m_suitMenu.handle, "/user/hand/<weapon>/input/trackpad/force");
 	knuckles.AddBinding(m_nextWeapon.handle, "/user/hand/<weapon>/input/squeeze/force");
 	knuckles.AddBinding(m_use.handle, "/user/hand/<!weapon>/input/trigger");
-	knuckles.AddBinding(m_use.handle, "/user/hand/<!weapon>/input/squeeze/force");
+	knuckles.AddBinding(m_gripUse.handle, "/user/hand/<!weapon>/input/squeeze/force");
 	knuckles.AddBinding(m_binoculars.handle, "/user/hand/<!weapon>/input/a");
 	knuckles.AddBinding(m_grenades.handle, "/user/hand/<weapon>/input/b");
 	knuckles.AddBinding(m_melee.handle, "/user/hand/<weapon>/input/thumbstick/click");
@@ -553,6 +555,7 @@ void OpenXRInput::UpdateIngameActions()
 	UpdateBooleanAction(m_nextWeapon);
 	UpdateBooleanAction(m_reload);
 	UpdateBooleanAction(m_use);
+	UpdateBooleanAction(m_gripUse);
 	UpdateBooleanAction(m_binoculars);
 	UpdateBooleanAction(m_nightvision);
 	UpdateBooleanAction(m_melee);

diff --git a/Code/VR/OpenXRInput.h b/Code/VR/OpenXRInput.h
@@ -61,6 +61,7 @@ class OpenXRInput
 	BooleanAction m_binoculars;
 	BooleanAction m_nextWeapon;
 	BooleanAction m_use;
+	BooleanAction m_gripUse;
 	BooleanAction m_nightvision;
 	BooleanAction m_melee;
 	BooleanAction m_grenades;