feature/develop-atys
Nimetu 4 years ago
parent 040eee5c9e
commit 29ef76e537

@ -645,26 +645,24 @@ void CGroupInSceneBubbleManager::addMessagePopupCenter (const string &message, C
"ui:interface", templateParams.empty()?NULL:&(templateParams[0]), (uint)templateParams.size());
if (group)
{
ucstring finalMessage = message;
string finalMessage = message;
ucstring::size_type pos = message.find(ucstring("|"));
string::size_type pos = message.find("|");
if (pos != std::string::npos)
{
CViewBitmap *pViewIcon = dynamic_cast<CViewBitmap*>(group->getView("iconA"));
if (pViewIcon != NULL)
{
string texture = message.substr(0, pos).toString();
pViewIcon->setTexture(texture);
pViewIcon->setTexture(message.substr(0, pos));
}
ucstring::size_type end = message.find(ucstring("|"), pos+1);
string::size_type end = message.find("|", pos+1);
if (end != std::string::npos)
{
CViewBitmap *pViewIcon = dynamic_cast<CViewBitmap*>(group->getView("iconZ"));
if (pViewIcon != NULL)
{
string texture = message.substr(end+1).toString();
pViewIcon->setTexture(texture);
pViewIcon->setTexture(message.substr(end+1));
}
finalMessage = message.substr(pos+1, end-pos-1);
}

@ -2532,11 +2532,11 @@ void CInterfaceManager::displaySystemInfo(const string &str, const string &cat)
CClientConfig::SSysInfoParam::TMode mode = CClientConfig::SSysInfoParam::Normal;
CRGBA color = CRGBA::White;
ucstring cleanStr = str;
ucstring::size_type pos = str.find(ucstring("|"));
string cleanStr = str;
string::size_type pos = str.find("|");
if (pos != std::string::npos)
{
ucstring::size_type end = str.find(ucstring("|"), pos+1);
string::size_type end = str.find("|", pos+1);
if (end != std::string::npos)
cleanStr = str.substr(pos+1, end-pos-1);
else

Loading…
Cancel
Save