fix up small melee bug

don't award Exp for firing when we're not firing
uqs · Mar 27, 2020 · 80eb064 · 80eb064
1 parent 4d6f686
commit 80eb064
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Battlescape/BattlescapeGame.cpp b/src/Battlescape/BattlescapeGame.cpp
@@ -838,7 +838,7 @@ void BattlescapeGame::handleNonTargetAction()
 				_parentState->warning("STR_NOT_ENOUGH_TIME_UNITS");
 			}
 		}
-		else if (_currentAction.type == BA_USE || _currentAction.type == BA_LAUNCH)
+		else if (_currentAction.type == BA_USE)
 		{
 			_save->reviveUnconsciousUnits();
 		}
@@ -853,7 +853,10 @@ void BattlescapeGame::handleNonTargetAction()
 				_parentState->warning("STR_NOT_ENOUGH_TIME_UNITS");
 			}
 		}
-		_currentAction.type = BA_NONE;
+		if (_currentAction.type != BA_HIT) // don't clear the action type if we're meleeing, let the melee action state take care of that
+		{
+			_currentAction.type = BA_NONE;
+		}
 		_parentState->updateSoldierInfo();
 	}
 
@@ -884,7 +887,7 @@ void BattlescapeGame::setupCursor()
 			getMap()->setCursorType(CT_AIM);
 		}
 	}
-	else
+	else if (_currentAction.type != BA_HIT)
 	{
 		_currentAction.actor = _save->getSelectedUnit();
 		if (_currentAction.actor)

diff --git a/src/Battlescape/MeleeAttackBState.cpp b/src/Battlescape/MeleeAttackBState.cpp
@@ -174,6 +174,8 @@ void MeleeAttackBState::think()
 //			_parent->getTileEngine()->checkReactionFire(_unit);
 //		}
 
+		_parent->getSave()->getBattleGame()->getCurrentAction()->type = BA_NONE; // do this to restore cursor
+
 		if (_parent->getSave()->getSide() == FACTION_PLAYER || _parent->getSave()->getDebugMode())
 		{
 			_parent->setupCursor();