Fix random grass particles due to sheathed weapons being active

Author: Crementif

src/hooking/camera.cpp

@@ -734,13 +734,13 @@ void CemuHooks::hook_EndCameraSide(PPCInterpreter_t* hCPU) {
 
     // todo: sometimes this can deadlock apparently?
     if (VRManager::instance().XR->GetRenderer()->IsInitialized() && side == OpenXR::EyeSide::RIGHT) {
-        CemuHooks::m_heldWeaponsLastUpdate[0] = CemuHooks::m_heldWeaponsLastUpdate[0]++;
-        CemuHooks::m_heldWeaponsLastUpdate[1] = CemuHooks::m_heldWeaponsLastUpdate[1]++;
-        if (CemuHooks::m_heldWeaponsLastUpdate[0] >= 6) {
-            CemuHooks::m_heldWeapons[0] = 0;
+        m_heldWeaponsLastUpdate[0]++;
+        m_heldWeaponsLastUpdate[1]++;
+        if (m_heldWeaponsLastUpdate[0] >= 6) {
+            m_heldWeapons[0] = 0;
         }
-        if (CemuHooks::m_heldWeaponsLastUpdate[1] >= 6) {
-            CemuHooks::m_heldWeapons[1] = 0;
+        if (m_heldWeaponsLastUpdate[1] >= 6) {
+            m_heldWeapons[1] = 0;
         }
     }
 

src/hooking/weapon.cpp

@@ -389,6 +389,9 @@ void CemuHooks::hook_EnableWeaponAttackSensor(PPCInterpreter_t* hCPU) {
         return;
     }
 
+    // Weapons not currently bound to a VR hand (e.g. sheathed on back) must never
+    // have their attack sensor activated, otherwise they cut grass / hit NPCs.
+    bool isHandBoundWeapon = (weaponPtr == m_heldWeapons[0] || weaponPtr == m_heldWeapons[1]);
 
     //AttackSensorInitArg arg = weapon.setupAttackSensor;
     //std::string attackSensorInitStr;
@@ -426,7 +429,7 @@ void CemuHooks::hook_EnableWeaponAttackSensor(PPCInterpreter_t* hCPU) {
 
     // Use the analysed motion to determine whether the weapon is swinging or stabbing, and whether the attackSensor should be active this frame
     bool CHEAT_alwaysEnableWeaponCollision = false;
-    if (isHeldByPlayer && (m_motionAnalyzers[heldIndex].IsAttacking() || CHEAT_alwaysEnableWeaponCollision)) {
+    if (isHandBoundWeapon && isHeldByPlayer && (m_motionAnalyzers[heldIndex].IsAttacking() || CHEAT_alwaysEnableWeaponCollision)) {
         m_motionAnalyzers[heldIndex].SetHitboxEnabled(true);
         //Log::print("!! Activate sensor for {}: isHeldByPlayer={}, weaponType={}", heldIndex, isHeldByPlayer, (int)weaponType);
         weapon.setupAttackSensor.resetAttack = 1;
@@ -459,7 +462,7 @@ void CemuHooks::hook_EnableWeaponAttackSensor(PPCInterpreter_t* hCPU) {
 
         writeMemory(weaponPtr, &weapon);
     }
-    else if (m_motionAnalyzers[heldIndex].IsHitboxEnabled()) {
+    else if (!isHandBoundWeapon || m_motionAnalyzers[heldIndex].IsHitboxEnabled()) {
         m_motionAnalyzers[heldIndex].SetHitboxEnabled(false);
         //Log::print("!! Deactivate sensor for {}: isHeldByPlayer={}, weaponType={}", heldIndex, isHeldByPlayer, (int)weaponType);