isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-22 15:48:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix loop in LegoROI::ColorAliasLookup (#756)

Browse source
This commit is contained in:
MS 2024-03-29 14:47:46 -04:00 committed by GitHub
parent 3878f79847
commit f447397eef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
LEGO1/lego/sources/roi/legoroi.cpp
View file

@ -23,9 +23,6 @@ typedef struct {
int m_alpha; int m_alpha;
} ROIColorAlias; } ROIColorAlias;
// GLOBAL: LEGO1 0x100dbe28
const double g_normalizeByteToFloat = 1.0 / 255;
// GLOBAL: LEGO1 0x101011b0 // GLOBAL: LEGO1 0x101011b0
ROIColorAlias g_roiColorAliases[22] = { ROIColorAlias g_roiColorAliases[22] = {
{"lego black", 0x21, 0x21, 0x21, 0}, {"lego black f", 0x21, 0x21, 0x21, 0}, {"lego black", 0x21, 0x21, 0x21, 0}, {"lego black f", 0x21, 0x21, 0x21, 0},
@ -529,19 +526,15 @@ LegoBool LegoROI::FUN_100a9bf0(const LegoChar* p_param, float& p_red, float& p_g
// FUNCTION: LEGO1 0x100a9c50 // FUNCTION: LEGO1 0x100a9c50
LegoBool LegoROI::ColorAliasLookup(const LegoChar* p_param, float& p_red, float& p_green, float& p_blue, float& p_alpha) LegoBool LegoROI::ColorAliasLookup(const LegoChar* p_param, float& p_red, float& p_green, float& p_blue, float& p_alpha)
{ {
// TODO: this seems awfully hacky for these devs. is there a dynamic way for (MxU32 i = 0; i < _countof(g_roiColorAliases); i++) {
// to represent `the end of this array` that would improve this?
unsigned int i = 0;
do {
if (strcmpi(g_roiColorAliases[i].m_name, p_param) == 0) { if (strcmpi(g_roiColorAliases[i].m_name, p_param) == 0) {
p_red = g_roiColorAliases[i].m_red * g_normalizeByteToFloat; p_red = g_roiColorAliases[i].m_red / 255.0;
p_green = g_roiColorAliases[i].m_green * g_normalizeByteToFloat; p_green = g_roiColorAliases[i].m_green / 255.0;
p_blue = g_roiColorAliases[i].m_blue * g_normalizeByteToFloat; p_blue = g_roiColorAliases[i].m_blue / 255.0;
p_alpha = g_roiColorAliases[i].m_alpha * g_normalizeByteToFloat; p_alpha = g_roiColorAliases[i].m_alpha / 255.0;
return TRUE; return TRUE;
} }
i++; }
} while ((int*) &g_roiColorAliases[i] < &g_roiConfig);
return FALSE; return FALSE;
} }