From 5eea7abc4d02dafedee15151a4d6a8f6e81d6ff4 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Wed, 16 Feb 2022 20:18:17 -0600
Subject: [PATCH] [nostalgia/core] Fix NostalgiaGraphic::getPixel4Bpp
---
src/nostalgia/core/gfx.hpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/nostalgia/core/gfx.hpp b/src/nostalgia/core/gfx.hpp
index 8256ef52..ce14e4f5 100644
--- a/src/nostalgia/core/gfx.hpp
+++ b/src/nostalgia/core/gfx.hpp
@@ -47,17 +47,17 @@ struct NostalgiaGraphic {
ox::Vector<uint8_t> pixels;
[[nodiscard]]
- constexpr auto getPixel4Bpp(std::size_t idx) const noexcept {
+ constexpr uint8_t getPixel4Bpp(std::size_t idx) const noexcept {
oxAssert(bpp == 4, "NostalgiaGraphic::getPixel4Bpp: wrong bpp");
if (idx & 1) {
- return this->pixels[idx / 2];
+ return this->pixels[idx / 2] >> 4;
} else {
- return this->pixels[idx / 2];
+ return this->pixels[idx / 2] & 0b0000'1111;
}
}
[[nodiscard]]
- constexpr auto getPixel8Bpp(std::size_t idx) const noexcept {
+ constexpr uint8_t getPixel8Bpp(std::size_t idx) const noexcept {
oxAssert(bpp == 8, "NostalgiaGraphic::getPixel8Bpp: wrong bpp");
return this->pixels[idx];
}