Use a constant for 0x8001 (#1596)

gbdev · Jan 4, 2025 · b13c0f2 · b13c0f2
1 parent d977342
commit b13c0f2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/include/gfx/pal_sorting.hpp b/include/gfx/pal_sorting.hpp
@@ -10,6 +10,10 @@
 
 #include "gfx/rgba.hpp"
 
+// Allow a slot for every possible CGB color, plus one for transparency
+// 32 (1 << 5) per channel, times 3 RGB channels = 32768 CGB colors
+static constexpr size_t NB_COLOR_SLOTS = (1 << (5 * 3)) + 1;
+
 struct Palette;
 
 void sortIndexed(
@@ -20,7 +24,7 @@ void sortIndexed(
     png_byte *palAlpha
 );
 void sortGrayscale(
-    std::vector<Palette> &palettes, std::array<std::optional<Rgba>, 0x8001> const &colors
+    std::vector<Palette> &palettes, std::array<std::optional<Rgba>, NB_COLOR_SLOTS> const &colors
 );
 void sortRgb(std::vector<Palette> &palettes);
 

diff --git a/src/gfx/pal_sorting.cpp b/src/gfx/pal_sorting.cpp
@@ -46,7 +46,7 @@ void sortIndexed(
 }
 
 void sortGrayscale(
-    std::vector<Palette> &palettes, std::array<std::optional<Rgba>, 0x8001> const &colors
+    std::vector<Palette> &palettes, std::array<std::optional<Rgba>, NB_COLOR_SLOTS> const &colors
 ) {
 	options.verbosePrint(Options::VERB_LOG_ACT, "Sorting palette by grayscale bins...\n");
 

diff --git a/src/gfx/process.cpp b/src/gfx/process.cpp
@@ -26,8 +26,7 @@
 #include "gfx/proto_palette.hpp"
 
 class ImagePalette {
-	// Use as many slots as there are CGB colors (plus transparency)
-	std::array<std::optional<Rgba>, 0x8001> _colors;
+	std::array<std::optional<Rgba>, NB_COLOR_SLOTS> _colors;
 
 public:
 	ImagePalette() = default;