From b2acfbc95d85872569a1ae5071f0253f99b078e0 Mon Sep 17 00:00:00 2001 From: obligaron Date: Sat, 25 Nov 2023 09:32:18 +0100 Subject: [PATCH] Fix remaining warnings in DiabloUI --- Source/DiabloUI/credits.cpp | 2 +- Source/DiabloUI/diabloui.cpp | 2 +- Source/DiabloUI/hero/selhero.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/DiabloUI/credits.cpp b/Source/DiabloUI/credits.cpp index 3a6b0b51a..17c343a32 100644 --- a/Source/DiabloUI/credits.cpp +++ b/Source/DiabloUI/credits.cpp @@ -115,7 +115,7 @@ void CreditsRenderer::Render() ScaleOutputRect(&viewport); // We use unscaled coordinates for calculation throughout. - Sint16 destY = uiPosition.y + VIEWPORT.y - (offsetY - linesBegin * LINE_H); + Sint16 destY = static_cast(uiPosition.y + VIEWPORT.y - (offsetY - linesBegin * LINE_H)); for (std::size_t i = linesBegin; i < linesEnd; ++i, destY += LINE_H) { Sint16 destX = uiPosition.x + VIEWPORT.x + 31; diff --git a/Source/DiabloUI/diabloui.cpp b/Source/DiabloUI/diabloui.cpp index e44459969..753b77791 100644 --- a/Source/DiabloUI/diabloui.cpp +++ b/Source/DiabloUI/diabloui.cpp @@ -810,7 +810,7 @@ void Render(const UiList &uiList) const Surface &out = Surface(DiabloUiSurface()); for (std::size_t i = listOffset; i < uiList.m_vecItems.size() && (i - listOffset) < ListViewportSize; ++i) { - SDL_Rect rect = uiList.itemRect(i - listOffset); + SDL_Rect rect = uiList.itemRect(static_cast(i - listOffset)); const UiListItem &item = *uiList.GetItem(i); if (i == SelectedItem) DrawSelector(rect); diff --git a/Source/DiabloUI/hero/selhero.cpp b/Source/DiabloUI/hero/selhero.cpp index e64e56924..70f121795 100644 --- a/Source/DiabloUI/hero/selhero.cpp +++ b/Source/DiabloUI/hero/selhero.cpp @@ -169,7 +169,7 @@ void SelheroListSelect(size_t value) } if (vecSelHeroDlgItems.size() > 4) itemH = 26; - int itemY = 246 + (176 - vecSelHeroDlgItems.size() * itemH) / 2; + int itemY = static_cast(246 + (176 - vecSelHeroDlgItems.size() * itemH) / 2); vecSelDlgItems.push_back(std::make_unique(vecSelHeroDlgItems, vecSelHeroDlgItems.size(), uiPosition.x + 264, (uiPosition.y + itemY), 320, itemH, UiFlags::AlignCenter | UiFlags::FontSize24 | UiFlags::ColorUiGold)); SDL_Rect rect2 = { (Sint16)(uiPosition.x + 279), (Sint16)(uiPosition.y + 429), 140, 35 };