github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-14 02:27:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed merge issues.

Browse source
This commit is contained in:
Nicholas Estelami 2022-07-25 23:11:45 -04:00
commit 3bb234e6a6
5 changed files with 27 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

18
soh/soh/Enhancements/debugconsole.cpp
View file

@ -569,7 +569,19 @@ void DebugConsole_LoadCVars() {
case nlohmann::detail::value_t::array:
break;
case nlohmann::detail::value_t::string:
CVar_SetString(item.key().c_str(), value.get<std::string>().c_str());
if (StringHelper::StartsWith(value.get<std::string>(), "#"))
{
uint32_t val = std::stoul(&value.get<std::string>().c_str()[1], nullptr, 16);
Color_RGBA8 clr;
clr.r = val >> 24;
clr.g = val >> 16;
clr.b = val >> 8;
clr.a = val & 0xFF;
CVar_SetRGBA(item.key().c_str(), clr);
}
else
CVar_SetString(item.key().c_str(), value.get<std::string>().c_str());
break;
case nlohmann::detail::value_t::boolean:
CVar_SetS32(item.key().c_str(), value.get<bool>());
@ -608,8 +620,8 @@ void DebugConsole_SaveCVars()
{
Color_RGBA8 clr = cvar.second->value.valueRGBA;
uint32_t val = (clr.r << 24) + (clr.g << 16) + (clr.b << 8) + clr.a;
Conf->setRGBA(clr);
//output += StringHelper::Sprintf("%s = #%08X\n", cvar.first.c_str(), val);
std::string str = StringHelper::Sprintf("#%08X", val);
pConf->setString(key, str);
}
}