1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-01-06 10:41:04 +00:00

Fix sign-compare warnings

This commit is contained in:
Andrew Lanzone 2025-06-08 02:28:42 -07:00
parent 81720892f9
commit 8094761c3e
18 changed files with 59 additions and 59 deletions

View file

@ -107,11 +107,11 @@ namespace MWGui
void setColour(int section, int line, int run, MyGUI::Colour colour) const override
{
if (section < 0 || section >= mSections.size())
if (section < 0 || section >= static_cast<int>(mSections.size()))
return;
if (line < 0 || line >= mSections[section].mLines.size())
if (line < 0 || line >= static_cast<int>(mSections[section].mLines.size()))
return;
if (run < 0 || run >= mSections[section].mLines[line].mRuns.size())
if (run < 0 || run >= static_cast<int>(mSections[section].mLines[line].mRuns.size()))
return;
mSections[section].mLines[line].mRuns[run].mStyle->mNormalColour = colour;

View file

@ -467,7 +467,7 @@ namespace MWGui
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (mControllerFocus >= 0 && mControllerFocus < mButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mButtons.size()))
onButtonClicked(mButtons[mControllerFocus]);
}
else if (arg.button == SDL_CONTROLLER_BUTTON_B)
@ -490,7 +490,7 @@ namespace MWGui
{
if (mButtons.size() <= 1)
return true;
if (mButtons.size() == 2 && mControllerFocus == mButtons.size() - 1)
if (mButtons.size() == 2 && mControllerFocus == static_cast<int>(mButtons.size()) - 1)
return true;
setControllerFocus(mButtons, mControllerFocus, false);
@ -992,7 +992,7 @@ namespace MWGui
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (mControllerFocus >= 0 && mControllerFocus < mAttributeButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mAttributeButtons.size()))
onAttributeClicked(mAttributeButtons[mControllerFocus]);
}
else if (arg.button == SDL_CONTROLLER_BUTTON_B)
@ -1094,7 +1094,7 @@ namespace MWGui
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (mControllerFocus >= 0 && mControllerFocus < mSkillButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mSkillButtons.size()))
onSkillClicked(mSkillButtons[mControllerFocus]);
}
else if (arg.button == SDL_CONTROLLER_BUTTON_B)

View file

@ -162,7 +162,7 @@ namespace MWGui
if (mBribe1000Button->getEnabled())
mButtons.push_back(mBribe1000Button);
for (int i = 0; i < mButtons.size(); i++)
for (size_t i = 0; i < mButtons.size(); i++)
mButtons[i]->setStateSelected(i == 0);
}
@ -604,7 +604,7 @@ namespace MWGui
void DialogueWindow::updateTopicsPane()
{
const std::string focusedTopic
= Settings::gui().mControllerMenus && mControllerFocus < mTopicsList->getItemCount()
= Settings::gui().mControllerMenus && mControllerFocus < static_cast<int>(mTopicsList->getItemCount())
? mTopicsList->getItemNameAt(mControllerFocus)
: "";
@ -924,10 +924,10 @@ namespace MWGui
void DialogueWindow::setControllerFocus(int index, bool focused)
{
// List is mTopicsList + "Goodbye" button below the list.
if (index < 0 || index > mTopicsList->getItemCount())
if (index < 0 || index > static_cast<int>(mTopicsList->getItemCount()))
return;
if (index == mTopicsList->getItemCount())
if (index == static_cast<int>(mTopicsList->getItemCount()))
{
mGoodbyeButton->setStateSelected(focused);
}
@ -957,10 +957,10 @@ namespace MWGui
{
if (mChoices.size() > 0)
{
if (mControllerChoice >= 0 && mControllerChoice < mChoices.size())
if (mControllerChoice >= 0 && mControllerChoice < static_cast<int>(mChoices.size()))
onChoiceActivated(mControllerChoice + 1); // +1 because choices are indexed starting at 1
}
else if (mControllerFocus == mTopicsList->getItemCount())
else if (mControllerFocus == static_cast<int>(mTopicsList->getItemCount()))
onGoodbyeActivated();
else
onSelectListItem(mTopicsList->getItemNameAt(mControllerFocus), mControllerFocus);
@ -975,7 +975,7 @@ namespace MWGui
if (mChoices.size() > 0)
{
// In-dialogue choice (red text)
mControllerChoice = std::clamp(mControllerChoice - 1, 0, (int)mChoices.size() - 1);
mControllerChoice = std::clamp(mControllerChoice - 1, 0, static_cast<int>(mChoices.size()) - 1);
mHistory->setFocusItem(mChoiceStyles.at(mControllerChoice));
}
else
@ -996,16 +996,16 @@ namespace MWGui
if (mChoices.size() > 0)
{
// In-dialogue choice (red text)
mControllerChoice = std::clamp(mControllerChoice + 1, 0, (int)mChoices.size() - 1);
mControllerChoice = std::clamp(mControllerChoice + 1, 0, static_cast<int>(mChoices.size()) - 1);
mHistory->setFocusItem(mChoiceStyles.at(mControllerChoice));
}
else
{
// Number of items is mTopicsList.length+1 because of "Goodbye" button.
setControllerFocus(mControllerFocus, false);
if (mControllerFocus >= mTopicsList->getItemCount())
if (mControllerFocus >= static_cast<int>(mTopicsList->getItemCount()))
mControllerFocus = 0;
else if (mControllerFocus == mTopicsList->getItemCount() - 1)
else if (mControllerFocus == static_cast<int>(mTopicsList->getItemCount()) - 1)
mControllerFocus = mTopicsList->getItemCount(); // "Goodbye" button
else if (mTopicsList->getItemNameAt(mControllerFocus + 1).length() == 0)
mControllerFocus += 2; // Skip separator

View file

@ -32,7 +32,7 @@ namespace MWGui
if (!MWBase::Environment::get().getWindowManager()->getJournalAllowed())
return;
for (int i = 0; i < mTabs.size(); i++)
for (int i = 0; i < static_cast<int>(mTabs.size()); i++)
{
if (mTabs[i] == sender)
{
@ -45,7 +45,7 @@ namespace MWGui
void InventoryTabsOverlay::setTab(int index)
{
for (int i = 0; i < mTabs.size(); i++)
for (int i = 0; i < static_cast<int>(mTabs.size()); i++)
mTabs[i]->setStateSelected(i == index);
}
}

View file

@ -249,7 +249,7 @@ namespace MWGui
if (button == SDL_CONTROLLER_BUTTON_A)
{
// Select the focused item, if any.
if (mControllerFocus >= 0 && mControllerFocus < mLines.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mLines.size()))
onIconClicked(mLines[mControllerFocus].mIcon);
}
else if (button == SDL_CONTROLLER_BUTTON_DPAD_UP)
@ -268,13 +268,13 @@ namespace MWGui
const TextColours& textColours{ MWBase::Environment::get().getWindowManager()->getTextColours() };
if (prevFocus >= 0 && prevFocus < mLines.size())
if (prevFocus >= 0 && prevFocus < static_cast<int>(mLines.size()))
{
mLines[prevFocus].mText->setTextColour(textColours.normal);
mLines[prevFocus].mIcon->setControllerFocus(false);
}
if (newFocus >= 0 && newFocus < mLines.size())
if (newFocus >= 0 && newFocus < static_cast<int>(mLines.size()))
{
mLines[newFocus].mText->setTextColour(textColours.link);
mLines[newFocus].mIcon->setControllerFocus(true);

View file

@ -61,7 +61,7 @@ namespace MWGui
mRows = std::max(maxHeight / 42, 1);
}
for (unsigned int i = 0; i < mItemCount; ++i)
for (int i = 0; i < mItemCount; ++i)
{
MyGUI::Widget* w = dragArea->getChildAt(i);

View file

@ -491,13 +491,13 @@ namespace
void addControllerButtons(Gui::MWList* _list, int _selectedIndex)
{
mButtons.clear();
for (int i = 0; i < _list->getItemCount(); i++)
for (size_t i = 0; i < _list->getItemCount(); i++)
{
MyGUI::Button* listItem = _list->getItemWidget(_list->getItemNameAt(i));
if (listItem)
{
listItem->setTextColour(
mButtons.size() == _selectedIndex ? MWGui::journalHeaderColour : MyGUI::Colour::Black);
static_cast<int>(mButtons.size()) == _selectedIndex ? MWGui::journalHeaderColour : MyGUI::Colour::Black);
mButtons.push_back(listItem);
}
}

View file

@ -231,7 +231,7 @@ namespace MWGui
if (Settings::gui().mControllerMenus)
{
mControllerFocus = 0;
for (int i = 0; i < mAttributeButtons.size(); i++)
for (size_t i = 0; i < mAttributeButtons.size(); i++)
setControllerFocus(mAttributeButtons, i, i == 0);
}
@ -386,7 +386,7 @@ namespace MWGui
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (mControllerFocus >= 0 && mControllerFocus < mAttributeButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mAttributeButtons.size()))
onAttributeClicked(mAttributeButtons[mControllerFocus]);
MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("Item Gold Up"));
}

View file

@ -178,7 +178,7 @@ namespace MWGui
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (mControllerFocus >= 0 && mControllerFocus < mButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mButtons.size()))
onRepairButtonClick(mButtons[mControllerFocus].first);
}
else if (arg.button == SDL_CONTROLLER_BUTTON_B)
@ -205,7 +205,7 @@ namespace MWGui
}
// Scroll the list to keep the active item in view
if (mControllerFocus >= 0 && mControllerFocus < mButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mButtons.size()))
{
int line = mButtons[mControllerFocus].second;
if (line <= 5)

View file

@ -446,7 +446,7 @@ namespace MWGui
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
mControllerFocus = std::clamp(mControllerFocus, 0, (int)mButtons.size() - 1);
mControllerFocus = std::clamp(mControllerFocus, 0, static_cast<int>(mButtons.size()) - 1);
buttonActivated(mButtons[mControllerFocus]);
}
else if (arg.button == SDL_CONTROLLER_BUTTON_B)
@ -469,7 +469,7 @@ namespace MWGui
{
if (mButtons.size() <= 1)
return true;
if (mButtons.size() == 2 && mControllerFocus == mButtons.size() - 1)
if (mButtons.size() == 2 && mControllerFocus == static_cast<int>(mButtons.size()) - 1)
return true;
setControllerFocus(mButtons, mControllerFocus, false);

View file

@ -119,7 +119,7 @@ namespace MWGui
if (Settings::gui().mControllerMenus)
{
mControllerFocus = 0;
for (int i = 0; i < mKey.size(); i++)
for (int i = 0; i < static_cast<int>(mKey.size()); i++)
mKey[i].button->setControllerFocus(i == mControllerFocus);
}
}
@ -490,7 +490,7 @@ namespace MWGui
mControllerFocus++;
}
for (int i = 0; i < mKey.size(); i++)
for (int i = 0; i < static_cast<int>(mKey.size()); i++)
mKey[i].button->setControllerFocus(i == mControllerFocus);
return true;

View file

@ -230,7 +230,7 @@ namespace MWGui
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (mControllerFocus >= 0 && mControllerFocus < mSpellButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mSpellButtons.size()))
onSpellButtonClick(mSpellButtons[mControllerFocus].first);
}
else if (arg.button == SDL_CONTROLLER_BUTTON_B)
@ -262,7 +262,7 @@ namespace MWGui
mSpellButtons[mControllerFocus].first->setStateSelected(true);
}
if (mControllerFocus >= 0 && mControllerFocus < mSpellButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mSpellButtons.size()))
{
// Scroll the list to keep the active item in view
int line = mSpellButtons[mControllerFocus].second;

View file

@ -390,7 +390,7 @@ namespace MWGui
bool EditEffectDialog::onControllerButtonEvent(const SDL_ControllerButtonEvent& arg)
{
int prevFocus = mControllerFocus;
mControllerFocus = std::clamp(mControllerFocus, 0, (int)mButtons.size() - 1);
mControllerFocus = std::clamp(mControllerFocus, 0, static_cast<int>(mButtons.size()) - 1);
MyGUI::TextBox* button = mButtons[mControllerFocus];
if (arg.button == SDL_CONTROLLER_BUTTON_A)
@ -415,7 +415,7 @@ namespace MWGui
else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_UP)
{
if (mControllerFocus == 0)
mControllerFocus = (int)mButtons.size() - 2;
mControllerFocus = static_cast<int>(mButtons.size()) - 2;
else if (button == mCancelButton && mDeleteButton->getVisible())
mControllerFocus -= 3;
else if (button == mCancelButton || (button == mOkButton && mDeleteButton->getVisible()))
@ -547,7 +547,7 @@ namespace MWGui
{
const TextColours& textColours{ MWBase::Environment::get().getWindowManager()->getTextColours() };
if (prevFocus >= 0 && prevFocus < mButtons.size())
if (prevFocus >= 0 && prevFocus < static_cast<int>(mButtons.size()))
{
MyGUI::TextBox* button = mButtons[prevFocus];
if (button == mMagnitudeMinValue || button == mMagnitudeMaxValue || button == mDurationValue
@ -561,7 +561,7 @@ namespace MWGui
}
}
if (newFocus >= 0 && newFocus < mButtons.size())
if (newFocus >= 0 && newFocus < static_cast<int>(mButtons.size()))
{
MyGUI::TextBox* button = mButtons[newFocus];
if (button == mMagnitudeMinValue || button == mMagnitudeMaxValue || button == mDurationValue
@ -1040,12 +1040,12 @@ namespace MWGui
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (!mRightColumn && mAvailableFocus >= 0 && mAvailableFocus < mAvailableButtons.size())
if (!mRightColumn && mAvailableFocus >= 0 && mAvailableFocus < static_cast<int>(mAvailableButtons.size()))
{
onAvailableEffectClicked(mAvailableButtons[mAvailableFocus]);
MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("Menu Click"));
}
else if (mRightColumn && mEffectFocus >= 0 && mEffectFocus < mEffectButtons.size())
else if (mRightColumn && mEffectFocus >= 0 && mEffectFocus < static_cast<int>(mEffectButtons.size()))
{
onEditEffect(mEffectButtons[mEffectFocus].second);
MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("Menu Click"));
@ -1061,14 +1061,14 @@ namespace MWGui
{
if (mRightColumn && mEffectButtons.size() > 0)
{
if (mEffectFocus >= 0 && mEffectFocus < mEffectButtons.size())
if (mEffectFocus >= 0 && mEffectFocus < static_cast<int>(mEffectButtons.size()))
mEffectButtons[mEffectFocus].first->setStateSelected(false);
mEffectFocus = wrap(mEffectFocus - 1, mEffectButtons.size());
mEffectButtons[mEffectFocus].first->setStateSelected(true);
}
else if (!mRightColumn && mAvailableButtons.size() > 0)
{
if (mAvailableFocus >= 0 && mAvailableFocus < mAvailableButtons.size())
if (mAvailableFocus >= 0 && mAvailableFocus < static_cast<int>(mAvailableButtons.size()))
mAvailableButtons[mAvailableFocus]->setStateSelected(false);
mAvailableFocus = wrap(mAvailableFocus - 1, mAvailableButtons.size());
mAvailableButtons[mAvailableFocus]->setStateSelected(true);
@ -1078,14 +1078,14 @@ namespace MWGui
{
if (mRightColumn && mEffectButtons.size() > 0)
{
if (mEffectFocus >= 0 && mEffectFocus < mEffectButtons.size())
if (mEffectFocus >= 0 && mEffectFocus < static_cast<int>(mEffectButtons.size()))
mEffectButtons[mEffectFocus].first->setStateSelected(false);
mEffectFocus = wrap(mEffectFocus + 1, mEffectButtons.size());
mEffectButtons[mEffectFocus].first->setStateSelected(true);
}
else if (!mRightColumn && mAvailableButtons.size() > 0)
{
if (mAvailableFocus >= 0 && mAvailableFocus < mAvailableButtons.size())
if (mAvailableFocus >= 0 && mAvailableFocus < static_cast<int>(mAvailableButtons.size()))
mAvailableButtons[mAvailableFocus]->setStateSelected(false);
mAvailableFocus = wrap(mAvailableFocus + 1, mAvailableButtons.size());
mAvailableButtons[mAvailableFocus]->setStateSelected(true);
@ -1094,17 +1094,17 @@ namespace MWGui
else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_LEFT && mRightColumn)
{
mRightColumn = false;
if (mEffectFocus >= 0 && mEffectFocus < mEffectButtons.size())
if (mEffectFocus >= 0 && mEffectFocus < static_cast<int>(mEffectButtons.size()))
mEffectButtons[mEffectFocus].first->setStateSelected(false);
if (mAvailableFocus >= 0 && mAvailableFocus < mAvailableButtons.size())
if (mAvailableFocus >= 0 && mAvailableFocus < static_cast<int>(mAvailableButtons.size()))
mAvailableButtons[mAvailableFocus]->setStateSelected(true);
}
else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_RIGHT && !mRightColumn && mEffectButtons.size() > 0)
{
mRightColumn = true;
if (mAvailableFocus >= 0 && mAvailableFocus < mAvailableButtons.size())
if (mAvailableFocus >= 0 && mAvailableFocus < static_cast<int>(mAvailableButtons.size()))
mAvailableButtons[mAvailableFocus]->setStateSelected(false);
if (mEffectFocus >= 0 && mEffectFocus < mEffectButtons.size())
if (mEffectFocus >= 0 && mEffectFocus < static_cast<int>(mEffectButtons.size()))
mEffectButtons[mEffectFocus].first->setStateSelected(true);
}
@ -1117,7 +1117,7 @@ namespace MWGui
mAvailableEffectsList->setViewOffset(-lineHeight * (mAvailableFocus - 5));
}
if (!mRightColumn && mAvailableFocus >= 0 && mAvailableFocus < mAvailableButtons.size())
if (!mRightColumn && mAvailableFocus >= 0 && mAvailableFocus < static_cast<int>(mAvailableButtons.size()))
{
// Warp the mouse to the selected spell to show the tooltip
if (MWBase::Environment::get().getWindowManager()->getControllerTooltip())

View file

@ -337,7 +337,7 @@ namespace MWGui
if (button == SDL_CONTROLLER_BUTTON_A)
{
// Select the focused item, if any.
if (mControllerFocus >= 0 && mControllerFocus < mButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mButtons.size()))
{
onSpellSelected(mButtons[mControllerFocus].first);
MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("Menu Click"));
@ -347,7 +347,7 @@ namespace MWGui
{
// Toggle info tooltip
mControllerTooltip = !mControllerTooltip;
if (mControllerTooltip && mControllerFocus >= 0 && mControllerFocus < mButtons.size())
if (mControllerTooltip && mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mButtons.size()))
MWBase::Environment::get().getInputManager()->warpMouseToWidget(mButtons[mControllerFocus].first);
}
else if (button == SDL_CONTROLLER_BUTTON_DPAD_UP)
@ -357,7 +357,7 @@ namespace MWGui
else if (button == SDL_CONTROLLER_BUTTON_DPAD_LEFT)
mControllerFocus = std::max(0, mControllerFocus - 10);
else if (button == SDL_CONTROLLER_BUTTON_DPAD_RIGHT)
mControllerFocus = std::min(mControllerFocus + 10, (int)mButtons.size() - 1);
mControllerFocus = std::min(mControllerFocus + 10, static_cast<int>(mButtons.size()) - 1);
else if (button == SDL_CONTROLLER_BUTTON_LEFTSHOULDER)
{
// Jump to first item in previous group
@ -395,14 +395,14 @@ namespace MWGui
if (mButtons.empty())
return;
if (prevFocus >= 0 && prevFocus < mButtons.size())
if (prevFocus >= 0 && prevFocus < static_cast<int>(mButtons.size()))
{
Gui::SharedStateButton* prev = mButtons[prevFocus].first;
if (prev)
prev->onMouseLostFocus(nullptr);
}
if (newFocus >= 0 && newFocus < mButtons.size())
if (newFocus >= 0 && newFocus < static_cast<int>(mButtons.size()))
{
Gui::SharedStateButton* focused = mButtons[newFocus].first;
if (focused)

View file

@ -251,7 +251,7 @@ namespace MWGui
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (mControllerFocus >= 0 && mControllerFocus < mTrainingButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mTrainingButtons.size()))
onTrainingSelected(mTrainingButtons[mControllerFocus]);
}
else if (arg.button == SDL_CONTROLLER_BUTTON_B)

View file

@ -258,7 +258,7 @@ namespace MWGui
{
if (arg.button == SDL_CONTROLLER_BUTTON_A)
{
if (mControllerFocus >= 0 && mControllerFocus < mDestinationButtons.size())
if (mControllerFocus >= 0 && mControllerFocus < static_cast<int>(mDestinationButtons.size()))
{
onTravelButtonClick(mDestinationButtons[mControllerFocus]);
MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("Menu Click"));

View file

@ -27,7 +27,7 @@ int MWGui::wrap(int index, int max)
void MWGui::setControllerFocus(std::vector<MyGUI::Button*> buttons, int index, bool focused)
{
if (index >= 0 && index < buttons.size())
if (index >= 0 && index < static_cast<int>(buttons.size()))
buttons[index]->setStateSelected(focused);
}

View file

@ -396,7 +396,7 @@ namespace MWGui
WindowBase* getActiveControllerWindow() override;
void cycleActiveControllerWindow(bool next) override;
void setActiveControllerWindow(GuiMode mode, int activeIndex) override;
const bool getControllerTooltip() const override { return mControllerTooltip; }
bool getControllerTooltip() const override { return mControllerTooltip; }
void setControllerTooltip(bool enabled) override;
void updateControllerButtonsOverlay() override;