Нужно избавится от std::atomic
This commit is contained in:
@@ -527,8 +527,6 @@ coro<> ServerSession::rP_Content(Net::AsyncSocket &sock) {
|
|||||||
|
|
||||||
while(!NetInputPackets.push(packet));
|
while(!NetInputPackets.push(packet));
|
||||||
|
|
||||||
LOG.info() << "Приняты воксели чанка " << int(wcId) << " / " << pos.X << ":" << pos.Y << ":" << pos.Z << " Вокселей " << debugCubesCount;
|
|
||||||
|
|
||||||
co_return;
|
co_return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -122,8 +122,6 @@ void RemoteClient::prepareChunkUpdate_Voxels(WorldId_t worldId, Pos::GlobalChunk
|
|||||||
prevSet = std::move(nextSet);
|
prevSet = std::move(nextSet);
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG.debug() << "Воксели чанка: " << worldId << " / " << chunkPos.X << ":" << chunkPos.Y << ":" << chunkPos.Z;
|
|
||||||
|
|
||||||
checkPacketBorder(voxels.size()*(2+6)+16);
|
checkPacketBorder(voxels.size()*(2+6)+16);
|
||||||
|
|
||||||
NextPacket << (uint8_t) ToClient::L1::Content
|
NextPacket << (uint8_t) ToClient::L1::Content
|
||||||
@@ -165,7 +163,6 @@ void RemoteClient::prepareChunkRemove(WorldId_t worldId, Pos::GlobalChunk chunkP
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG.debug() << "Чанк потерян: " << worldId << " / " << chunkPos.X << ":" << chunkPos.Y << ":" << chunkPos.Z;
|
|
||||||
WorldId_c cwId = worldId ? ResRemap.Worlds.toClient(worldId) : worldId;
|
WorldId_c cwId = worldId ? ResRemap.Worlds.toClient(worldId) : worldId;
|
||||||
|
|
||||||
checkPacketBorder(16);
|
checkPacketBorder(16);
|
||||||
|
|||||||
@@ -588,4 +588,4 @@ public:
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MAKE_ERROR(arg) throw std::runtime_error(static_cast<std::ostringstream&>(std::ostringstream() << arg).str())
|
#define MAKE_ERROR(arg) throw std::runtime_error((std::ostringstream() << arg).str())
|
||||||
|
|||||||
Reference in New Issue
Block a user