Browse Source

Fix remaining warnings in DiabloUI

pull/6836/head
obligaron 2 years ago committed by Anders Jenbo
parent
commit
b2acfbc95d
  1. 2
      Source/DiabloUI/credits.cpp
  2. 2
      Source/DiabloUI/diabloui.cpp
  3. 2
      Source/DiabloUI/hero/selhero.cpp

2
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<Sint16>(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;

2
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<int>(i - listOffset));
const UiListItem &item = *uiList.GetItem(i);
if (i == SelectedItem)
DrawSelector(rect);

2
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<int>(246 + (176 - vecSelHeroDlgItems.size() * itemH) / 2);
vecSelDlgItems.push_back(std::make_unique<UiList>(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 };

Loading…
Cancel
Save