From 55231bb8d3e1a4e2752ac3d444c4287eb0ca4e8b Mon Sep 17 00:00:00 2001 From: void_17 <61356189+void2012@users.noreply.github.com> Date: Fri, 6 Mar 2026 02:11:18 +0700 Subject: Remove AUTO_VAR macro and _toString function (#592) --- Minecraft.World/CombatTracker.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Minecraft.World/CombatTracker.cpp') diff --git a/Minecraft.World/CombatTracker.cpp b/Minecraft.World/CombatTracker.cpp index 77aac68a..2d35913c 100644 --- a/Minecraft.World/CombatTracker.cpp +++ b/Minecraft.World/CombatTracker.cpp @@ -13,9 +13,9 @@ CombatTracker::CombatTracker(LivingEntity *mob) CombatTracker::~CombatTracker() { - for (AUTO_VAR(it,entries.begin()); it != entries.end(); ++it) + for ( auto& it : entries ) { - delete (*it); + delete it; } } @@ -138,9 +138,8 @@ shared_ptr CombatTracker::getKiller() float bestMobDamage = 0; float bestPlayerDamage = 0; - for (AUTO_VAR(it,entries.begin()); it != entries.end(); ++it) + for ( CombatEntry *entry : entries ) { - CombatEntry *entry = *it; if ( entry->getSource() != NULL && entry->getSource()->getEntity() != NULL && entry->getSource()->getEntity()->instanceof(eTYPE_PLAYER) && (bestPlayer == NULL || entry->getDamage() > bestPlayerDamage)) { bestPlayerDamage = entry->getDamage(); @@ -241,9 +240,9 @@ void CombatTracker::recheckStatus() if (takingDamage && mob->tickCount - lastDamageTime > reset) { - for (AUTO_VAR(it,entries.begin()); it != entries.end(); ++it) + for ( auto& it : entries ) { - delete (*it); + delete it; } entries.clear(); takingDamage = false; -- cgit v1.2.3