Fix bug of placing loaded ammo on ground

Yankes · Aug 20, 2017 · 5e97b19 · 5e97b19
1 parent 88c4cb8
commit 5e97b19
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/Battlescape/BattlescapeGenerator.cpp b/src/Battlescape/BattlescapeGenerator.cpp
@@ -481,11 +481,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)->getSlot() == ground)
 		{
-			_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());
+			}
 		}
 	}