Address PR feedback.

This commit is contained in:
Brian Phlipot
2023-02-02 11:54:17 -08:00
committed by teejusb
parent 4a6b1a743c
commit d079940fea
44 changed files with 259 additions and 236 deletions
+6 -6
View File
@@ -205,7 +205,7 @@ inline void VerifySelected(SelectType st, std::vector<bool> &selected, const RSt
int num_selected = 0;
if( st == SELECT_ONE )
{
int first_selected= -1;
size_t first_selected= std::numeric_limits<size_t>::max();
if(selected.empty())
{
LuaHelpers::ReportScriptErrorFmt("Option row %s requires only one "
@@ -213,14 +213,14 @@ inline void VerifySelected(SelectType st, std::vector<bool> &selected, const RSt
"elements.", sName.c_str());
return;
}
for(unsigned int e= 0; e < selected.size(); ++e)
for(size_t e= 0; e < selected.size(); ++e)
{
if(selected[e])
{
num_selected++;
if(first_selected == -1)
if(first_selected == std::numeric_limits<size_t>::max())
{
first_selected= static_cast<int>(e);
first_selected= e;
}
}
}
@@ -229,9 +229,9 @@ inline void VerifySelected(SelectType st, std::vector<bool> &selected, const RSt
LuaHelpers::ReportScriptErrorFmt("Option row %s requires only one "
"thing to be selected, but %i out of %i things are selected.",
sName.c_str(), num_selected, static_cast<int>(selected.size()));
for(unsigned int e= 0; e < selected.size(); ++e)
for(size_t e= 0; e < selected.size(); ++e)
{
if(selected[e] && (first_selected < 0 || e != static_cast<uint32_t>(first_selected)))
if(selected[e] && e != first_selected)
{
selected[e]= false;
}