Skip to content

Commit ef7509c

Browse files
committed
fix for bug 541
1 parent 95039fe commit ef7509c

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

src/Battlescape/BattlescapeGenerator.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,19 @@ void BattlescapeGenerator::runInventory(Craft *craft)
18941894
// ok now generate the battleitems for inventory
18951895
setCraft(craft);
18961896
deployXCOM();
1897-
1897+
// ok, now remove any vehicles that may have somehow ended up in our battlescape
1898+
for (std::vector<BattleUnit*>::iterator i = _save->getUnits()->begin(); i != _save->getUnits()->end(); )
1899+
{
1900+
if ((*i)->getGeoscapeSoldier())
1901+
{
1902+
++i;
1903+
}
1904+
else
1905+
{
1906+
delete *i;
1907+
i = _save->getUnits()->erase(i);
1908+
}
1909+
}
18981910
delete data;
18991911
delete set;
19001912
}

0 commit comments

Comments
 (0)