More waypoint fixes

OpenXcom · Dec 31, 2019 · 00242b6 · 00242b6
1 parent 45efef7
commit 00242b6
Showing 1 changed file with 6 additions and 22 deletions.
diff --git a/src/Battlescape/BattlescapeState.cpp b/src/Battlescape/BattlescapeState.cpp
@@ -926,17 +926,7 @@ void BattlescapeState::btnInventoryClick(Action *)
 	if (playableUnitSelected()
 		&& (_save->getSelectedUnit()->hasInventory() || _save->getDebugMode()))
 	{
-		// clean up the waypoints
-		if (_battleGame->getCurrentAction()->type == BA_LAUNCH)
-		{
-			_battleGame->getCurrentAction()->waypoints.clear();
-			_battleGame->getMap()->getWaypoints()->clear();
-			showLaunchButton(false);
-		}
-
-		_battleGame->getPathfinding()->removePreview();
-		_battleGame->cancelCurrentAction(true);
-
+		_battleGame->cancelAllActions();
 		_game->pushState(new InventoryState(!_save->getDebugMode(), this));
 	}
 }
@@ -1082,7 +1072,7 @@ void BattlescapeState::btnStatsClick(Action *action)
 {
 	if (playableUnitSelected())
 	{
-		bool b = true;
+		bool scroll = false;
 		if (SCROLL_TRIGGER == Options::battleEdgeScroll &&
 			SDL_MOUSEBUTTONUP == action->getDetails()->type && SDL_BUTTON_LEFT == action->getDetails()->button.button)
 		{
@@ -1094,19 +1084,13 @@ void BattlescapeState::btnStatsClick(Action *action)
 				|| (posY > (_map->getHeight() - Camera::SCROLL_BORDER) * action->getYScale()))
 				// To avoid handling this event as a click
 				// on the stats button when the mouse is on the scroll-border
-				b = false;
+				scroll = true;
 		}
-		// clean up the waypoints
-		if (_battleGame->getCurrentAction()->type == BA_LAUNCH)
+		if (!scroll)
 		{
-			_battleGame->getCurrentAction()->waypoints.clear();
-			_battleGame->getMap()->getWaypoints()->clear();
-			showLaunchButton(false);
+			_battleGame->cancelAllActions();
+			popup(new UnitInfoState(_save->getSelectedUnit(), this, false, false));
 		}
-
-		_battleGame->cancelCurrentAction(true);
-
-		if (b) popup(new UnitInfoState(_save->getSelectedUnit(), this, false, false));
 	}
 }