[nostalgia/core/userland] Fix automatic type conversion warnings

This commit is contained in:
Gary Talent 2021-06-26 02:29:57 -05:00
parent ecc049c35b
commit 8b976279e5

View File

@ -43,7 +43,7 @@ ox::Error loadBgTileSheet(Context *ctx,
const unsigned bytesPerTile = tilesheet.bpp == 8 ? 64 : 32; const unsigned bytesPerTile = tilesheet.bpp == 8 ? 64 : 32;
const auto tiles = tilesheet.pixels.size() / bytesPerTile; const auto tiles = tilesheet.pixels.size() / bytesPerTile;
constexpr int width = 8; constexpr int width = 8;
const int height = 8 * tiles; const int height = 8 * static_cast<int>(tiles);
ox::Vector<uint32_t> pixels; ox::Vector<uint32_t> pixels;
if (bytesPerTile == 64) { // 8 BPP if (bytesPerTile == 64) { // 8 BPP
pixels.resize(tilesheet.pixels.size()); pixels.resize(tilesheet.pixels.size());
@ -62,7 +62,7 @@ ox::Error loadBgTileSheet(Context *ctx,
void puts(Context *ctx, int column, int row, const char *str) noexcept { void puts(Context *ctx, int column, int row, const char *str) noexcept {
for (int i = 0; str[i]; ++i) { for (int i = 0; str[i]; ++i) {
setTile(ctx, 0, column + i, row, static_cast<uint8_t>(charMap[static_cast<int>(str[i])])); setTile(ctx, 0, column + i, row, static_cast<uint8_t>(charMap[static_cast<uint8_t>(str[i])]));
} }
} }