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/MapItemSavedData.cpp | 52 ++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 29 deletions(-) (limited to 'Minecraft.World/MapItemSavedData.cpp') diff --git a/Minecraft.World/MapItemSavedData.cpp b/Minecraft.World/MapItemSavedData.cpp index 981bab3e..c06c3fac 100644 --- a/Minecraft.World/MapItemSavedData.cpp +++ b/Minecraft.World/MapItemSavedData.cpp @@ -64,7 +64,7 @@ charArray MapItemSavedData::HoldingPlayer::nextUpdatePacket(shared_ptrdecorations.size(); unsigned int nonPlayerDecorationsSize = (int)parent->nonPlayerDecorations.size(); charArray data = charArray( (playerDecorationsSize + nonPlayerDecorationsSize ) * DEC_PACKET_BYTES + 1); @@ -79,7 +79,7 @@ charArray MapItemSavedData::HoldingPlayer::nextUpdatePacket(shared_ptrimg << 4) | (md->rot & 0xF)); #endif data[i * DEC_PACKET_BYTES + 2] = md->x; - data[i * DEC_PACKET_BYTES + 3] = md->y; + data[i * DEC_PACKET_BYTES + 3] = md->y; data[i * DEC_PACKET_BYTES + 4] = md->entityId & 0xFF; data[i * DEC_PACKET_BYTES + 5] = (md->entityId>>8) & 0xFF; data[i * DEC_PACKET_BYTES + 6] = (md->entityId>>16) & 0xFF; @@ -87,9 +87,9 @@ charArray MapItemSavedData::HoldingPlayer::nextUpdatePacket(shared_ptrvisible ? 0x80 : 0x0; } unsigned int dataIndex = playerDecorationsSize; - for(AUTO_VAR(it, parent->nonPlayerDecorations.begin()); it != parent->nonPlayerDecorations.end(); ++it) + for(auto it : parent->nonPlayerDecorations) { - MapDecoration *md = it->second; + MapDecoration *md = it.second; #ifdef _LARGE_WORLDS data[dataIndex * DEC_PACKET_BYTES + 1] = (char) (md->img); data[dataIndex * DEC_PACKET_BYTES + 8] = (char) (md->rot & 0xF); @@ -97,7 +97,7 @@ charArray MapItemSavedData::HoldingPlayer::nextUpdatePacket(shared_ptrimg << 4) | (md->rot & 0xF)); #endif data[dataIndex * DEC_PACKET_BYTES + 2] = md->x; - data[dataIndex * DEC_PACKET_BYTES + 3] = md->y; + data[dataIndex * DEC_PACKET_BYTES + 3] = md->y; data[dataIndex * DEC_PACKET_BYTES + 4] = md->entityId & 0xFF; data[dataIndex * DEC_PACKET_BYTES + 5] = (md->entityId>>8) & 0xFF; data[dataIndex * DEC_PACKET_BYTES + 6] = (md->entityId>>16) & 0xFF; @@ -246,21 +246,21 @@ void MapItemSavedData::tickCarriedBy(shared_ptr player, shared_ptr hp = *it; // 4J Stu - Players in the same dimension as an item frame with a map need to be sent this data, so don't remove them if (hp->player->removed ) //|| (!hp->player->inventory->contains(item) && !item->isFramed() )) { - AUTO_VAR(it2, carriedByPlayers.find( (shared_ptr ) hp->player )); - if( it2 != carriedByPlayers.end() ) + auto it2 = carriedByPlayers.find(shared_ptr(hp->player)); + if( it2 != carriedByPlayers.end() ) { carriedByPlayers.erase( it2 ); } @@ -275,9 +275,8 @@ void MapItemSavedData::tickCarriedBy(shared_ptr player, shared_ptrgetPlayerList(); - for(AUTO_VAR(it3, players->players.begin()); it3 != players->players.end(); ++it3) + for( const auto& serverPlayer : players->players) { - shared_ptr serverPlayer = *it3; if(serverPlayer->dimension == 1) { atLeastOnePlayerInTheEnd = true; @@ -285,8 +284,8 @@ void MapItemSavedData::tickCarriedBy(shared_ptr player, shared_ptr player, shared_ptrisFramed()) { //addDecoration(1, player.level, "frame-" + item.getFrame().entityId, item.getFrame().xTile, item.getFrame().zTile, item.getFrame().dir * 90); - + if( nonPlayerDecorations.find( item->getFrame()->entityId ) == nonPlayerDecorations.end() ) { float xd = (float) ( item->getFrame()->xTile - x ) / (1 << scale); @@ -361,10 +360,8 @@ void MapItemSavedData::tickCarriedBy(shared_ptr player, shared_ptrentities.begin()); it != playerLevel->entities.end(); ++it) + for(auto& ent : playerLevel->entities) { - shared_ptr ent = *it; - if((ent->GetType() & eTYPE_ENEMY) == 0) continue; float xd = (float) ( ent->x - x ) / (1 << scale); @@ -400,9 +397,8 @@ void MapItemSavedData::tickCarriedBy(shared_ptr player, shared_ptrgetPlayerList(); - for(AUTO_VAR(it3, players->players.begin()); it3 != players->players.end(); ++it3) + for(auto& decorationPlayer : players->players) { - shared_ptr decorationPlayer = *it3; if(decorationPlayer!=NULL && decorationPlayer->dimension == this->dimension) { float xd = (float) (decorationPlayer->x - x) / (1 << scale); @@ -481,8 +477,8 @@ void MapItemSavedData::tickCarriedBy(shared_ptr player, shared_ptr itemInstance, Level *level, shared_ptr player) { - AUTO_VAR(it, carriedByPlayers.find(player)); - if (it == carriedByPlayers.end() ) return charArray(); + auto it = carriedByPlayers.find(player); + if (it == carriedByPlayers.end() ) return charArray(); shared_ptr hp = it->second; return hp->nextUpdatePacket(itemInstance); @@ -492,10 +488,8 @@ void MapItemSavedData::setDirty(int x, int y0, int y1) { SavedData::setDirty(); - AUTO_VAR(itEnd, carriedBy.end()); - for (AUTO_VAR(it, carriedBy.begin()); it != itEnd; it++) + for (auto& hp : carriedBy) { - shared_ptr hp = *it; //carriedBy.at(i); if (hp->rowsDirtyMin[x] < 0 || hp->rowsDirtyMin[x] > y0) hp->rowsDirtyMin[x] = y0; if (hp->rowsDirtyMax[x] < 0 || hp->rowsDirtyMax[x] < y1) hp->rowsDirtyMax[x] = y1; } @@ -547,9 +541,9 @@ void MapItemSavedData::handleComplexItemData(charArray &data) shared_ptr MapItemSavedData::getHoldingPlayer(shared_ptr player) { shared_ptr hp = nullptr; - AUTO_VAR(it,carriedByPlayers.find(player)); + auto it = carriedByPlayers.find(player); - if (it == carriedByPlayers.end()) + if (it == carriedByPlayers.end()) { hp = shared_ptr( new HoldingPlayer(player, this) ); carriedByPlayers[player] = hp; @@ -587,7 +581,7 @@ void MapItemSavedData::mergeInMapData(shared_ptr dataToAdd) colors[x + z * w] = newColor; } } - if (yd0 <= yd1) + if (yd0 <= yd1) { setDirty(x, yd0, yd1); } @@ -598,7 +592,7 @@ void MapItemSavedData::removeItemFrameDecoration(shared_ptr item) { if ( !item ) return; - + std::shared_ptr frame = item->getFrame(); if ( !frame ) return; -- cgit v1.2.3