tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-05-06 11:41:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed house color issue caused by refactor .

Browse source
This commit is contained in:
Zero Fanker 2024-04-16 21:38:58 -04:00
parent 9e87d7f98e
commit d45137f942
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
MissionEditor/IsoView.cpp
View file

@ -3122,29 +3122,26 @@ COLORREF CIsoView::GetColor(const char* house, const char* vcolor)
COLORREF other = RGB(255, 255, 0);
CString color;
CString colorValues;
CIniFile& ini = Map->GetIniFile();
if (house && strlen(house)) {
auto const& localColorDef = ini.GetString(house, "Color");
if (!localColorDef.IsEmpty()) {
color = localColorDef;
} else {
color = rules.GetString(house, "Color");
}
color = rules.GetString(house, "Color");
color = ini.GetStringOr(house, "Color", color);//override
}
if (vcolor)
color = vcolor;
if (vcolor) {
colorValues = vcolor;
} else if (!color.IsEmpty()) {
colorValues = rules.GetString("Colors", color);
colorValues = ini.GetStringOr("Colors", color, colorValues);
}
auto colorArray = SplitParams(colorValues);
if (color) {
CString colorValues;
colorValues = ini.GetStringOr("Colors", color, rules.GetString("Colors", color));
auto colorArray = SplitParams(colorValues);
if (colorArray.size() == 3) {
unsigned char hsv[3] = { static_cast<unsigned char>(std::atoi(colorArray[0])), static_cast<unsigned char>(std::atoi(colorArray[1])), static_cast<unsigned char>(std::atoi(colorArray[2])) };
unsigned char rgb[3];
HSVToRGB(hsv, rgb);
return RGB(rgb[0], rgb[1], rgb[2]);
}
if (colorArray.size() == 3) {
unsigned char hsv[3] = { static_cast<unsigned char>(std::atoi(colorArray[0])), static_cast<unsigned char>(std::atoi(colorArray[1])), static_cast<unsigned char>(std::atoi(colorArray[2])) };
unsigned char rgb[3];
HSVToRGB(hsv, rgb);
return RGB(rgb[0], rgb[1], rgb[2]);
}
#ifndef RA2_MODE