1 parent 8f9f926 commit 4c25247Copy full SHA for 4c25247
1 file changed
src/Battlescape/BattlescapeGenerator.cpp
@@ -947,11 +947,13 @@ void BattlescapeGenerator::deployAliens(AlienDeployment *deployment)
947
}
948
else
949
{
950
+ if ((*d).itemSets.size() == 0)
951
+ {
952
+ throw Exception("Unit generator encountered an error: item set not defined");
953
+ }
954
if (itemLevel >= (*d).itemSets.size())
955
- std::stringstream ss;
- ss << "Unit generator encountered an error: not enough item sets defined, expected: " << itemLevel + 1 << " found: " << (*d).itemSets.size();
- throw Exception(ss.str());
956
+ itemLevel = (*d).itemSets.size() - 1;
957
958
for (std::vector<std::string>::iterator it = (*d).itemSets.at(itemLevel).items.begin(); it != (*d).itemSets.at(itemLevel).items.end(); ++it)
959
0 commit comments