fix ammo duplication glitch on multi stage missions

OpenXcom · Aug 22, 2017 · f03f6d1 · f03f6d1
1 parent 945a7d6
commit f03f6d1
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/Battlescape/BattlescapeGenerator.cpp b/src/Battlescape/BattlescapeGenerator.cpp
@@ -439,11 +439,14 @@ void BattlescapeGenerator::nextStage()
 	for (std::vector<BattleItem*>::iterator i = takeToNextStage.begin(); i != takeToNextStage.end(); ++i)
 	{
 		_save->getItems()->push_back(*i);
-		_craftInventoryTile->addItem(*i, ground);
-		if ((*i)->getUnit())
+		if (!(*i)->isAmmo())
 		{
-			_craftInventoryTile->setUnit((*i)->getUnit());
-			(*i)->getUnit()->setPosition(_craftInventoryTile->getPosition());
+			_craftInventoryTile->addItem(*i, ground);
+			if ((*i)->getUnit())
+			{
+				_craftInventoryTile->setUnit((*i)->getUnit());
+				(*i)->getUnit()->setPosition(_craftInventoryTile->getPosition());
+			}
 		}
 	}