gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 02:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly detect tiles with more than 4 colours

Browse Source 
Fixes #1127, which was caused by a dumb logic error. Duh me.
This commit is contained in:
ISSOtm
2023-02-08 00:20:55 +01:00
parent 4e712807d7
commit 33a0857b8d
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gfx/proto_palette.cpp
View File

@@ -17,24 +17,29 @@
bool ProtoPalette::add(uint16_t color) {
size_t i = 0;
// Seek the first slot greater than our color
// Seek the first slot greater than the new color
// (A linear search is better because we don't store the array size,
// and there are very few slots anyway)
while (_colorIndices[i] < color) {
++i;
if (i == _colorIndices.size())
return false;
if (i == _colorIndices.size()) {
// We reached the end of the array without finding the color, so it's a new one.
return true;
}
}
// If we found it, great! Nothing else to do.
if (_colorIndices[i] == color) {
return false;
}
// If we found ourselves, great!
if (_colorIndices[i] == color)
return true;
// Swap entries until the end
while (_colorIndices[i] != UINT16_MAX) {
std::swap(_colorIndices[i], color);
++i;
if (i == _colorIndices.size())
return false; // Oh well
if (i == _colorIndices.size()) {
// The set is full, but doesn't include the new color.
return true;
}
}
// Write that last one into the new slot
_colorIndices[i] = color;