Fix ability keep applied on certain situation

- Fix umbrella keep applied on pause-release-resume - Fix umbrella keep applied on split while using it
copyrat90 · Jul 11, 2021 · 2769716 · 2769716
1 parent 7f13b03
commit 2769716
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/game_system_PhysicsMovement.cpp b/src/game_system_PhysicsMovement.cpp
@@ -528,6 +528,18 @@ void PhysicsMovement::PlayerKeyboardHandle_()
     {
         symbolAbilityRelease(*state_.symbolsInHands[1]);
     }
+    // left symbol ability: Cancel
+    if ((mergeOngoing || bn::keypad::start_pressed()) && state_.symbolsInHands[0] &&
+        state_.symbolsInHands[0]->GetAbilityState() == entity::Symbol::AbilityState::USING)
+    {
+        symbolAbilityRelease(*state_.symbolsInHands[0]);
+    }
+    // right symbol ability: Cancel
+    if ((mergeOngoing || bn::keypad::start_pressed()) && state_.symbolsInHands[1] &&
+        state_.symbolsInHands[1]->GetAbilityState() == entity::Symbol::AbilityState::USING)
+    {
+        symbolAbilityRelease(*state_.symbolsInHands[1]);
+    }
 
     if (!mergeOngoing && bn::keypad::a_pressed() && state_.player.GetGrounded() && !pressAJumping_)
     {