Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove AUTO_VAR macro and _toString function (#592)

Browse Source
This commit is contained in:
void_17
2026-03-06 02:11:18 +07:00
committed by GitHub
parent 7d6658fe5b
commit 55231bb8d3
294 changed files with 5067 additions and 5773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Minecraft.World/ItemInstance.cpp
View File

@@ -588,7 +588,7 @@ vector<HtmlString> *ItemInstance::getHoverText(shared_ptr<Player> player, bool a
/*if (!hasCustomHoverName() && id == Item::map_Id)
{
title.text += L" #" + _toString(auxValue);
title.text += L" #" + std::to_wstring(auxValue);
}*/
lines->push_back(title);
@@ -652,20 +652,20 @@ vector<HtmlString> *ItemInstance::getHoverText(shared_ptr<Player> player, bool a
if (!modifiers->empty())
{
// New line
lines->push_back(HtmlString(L""));
lines->emplace_back(L"");
// Modifier descriptions
for (AUTO_VAR(it, modifiers->begin()); it != modifiers->end(); ++it)
for (auto& modifier : *modifiers)
{
// 4J: Moved modifier string building to AttributeModifier
lines->push_back(it->second->getHoverText(it->first));
lines->push_back(modifier.second->getHoverText(modifier.first));
}
}
// Delete modifiers map
for (AUTO_VAR(it, modifiers->begin()); it != modifiers->end(); ++it)
for (auto& it : *modifiers)
{
AttributeModifier *modifier = it->second;
AttributeModifier *modifier = it.second;
delete modifier;
}
delete modifiers;
@@ -674,7 +674,7 @@ vector<HtmlString> *ItemInstance::getHoverText(shared_ptr<Player> player, bool a
{
if (isDamaged())
{
wstring damageStr = L"Durability: LOCALISE " + _toString<int>((getMaxDamage()) - getDamageValue()) + L" / " + _toString<int>(getMaxDamage());
wstring damageStr = L"Durability: LOCALISE " + std::to_wstring((getMaxDamage()) - getDamageValue()) + L" / " + std::to_wstring(getMaxDamage());
lines->push_back(HtmlString(damageStr));
}
}