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

13
Minecraft.World/Villager.cpp
View File

@@ -125,9 +125,8 @@ void Villager::serverAiMobStep()
if (offers->size() > 0)
{
//for (MerchantRecipe recipe : offers)
for(AUTO_VAR(it, offers->begin()); it != offers->end(); ++it)
for(auto& recipe : *offers)
{
MerchantRecipe *recipe = *it;
if (recipe->isDeprecated())
{
recipe->increaseMaxUses(random->nextInt(6) + random->nextInt(6) + 2);
@@ -615,8 +614,8 @@ shared_ptr<ItemInstance> Villager::getItemTradeInValue(int itemId, Random *rando
int Villager::getTradeInValue(int itemId, Random *random)
{
AUTO_VAR(it,MIN_MAX_VALUES.find(itemId));
if (it == MIN_MAX_VALUES.end())
auto it = MIN_MAX_VALUES.find(itemId);
if (it == MIN_MAX_VALUES.end())
{
return 1;
}
@@ -660,8 +659,8 @@ void Villager::addItemForPurchase(MerchantRecipeList *list, int itemId, Random *
int Villager::getPurchaseCost(int itemId, Random *random)
{
AUTO_VAR(it,MIN_MAX_PRICES.find(itemId));
if (it == MIN_MAX_PRICES.end())
auto it = MIN_MAX_PRICES.find(itemId);
if (it == MIN_MAX_PRICES.end())
{
return 1;
}
@@ -677,7 +676,7 @@ void Villager::handleEntityEvent(byte id)
{
if (id == EntityEvent::LOVE_HEARTS)
{
addParticlesAroundSelf(eParticleType_heart);
addParticlesAroundSelf(eParticleType_heart);
}
else if (id == EntityEvent::VILLAGER_ANGRY)
{