diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:49:42 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:49:42 +1100 |
commit | aa987a217779e71f97ee4c9cce531aec1c861bf8 (patch) | |
tree | e51fcce110306d93bf93870f13a5ff7d6b575427 /source/game/StarWorldGeneration.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarWorldGeneration.cpp')
-rw-r--r-- | source/game/StarWorldGeneration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/game/StarWorldGeneration.cpp b/source/game/StarWorldGeneration.cpp index 301df08..55a3b46 100644 --- a/source/game/StarWorldGeneration.cpp +++ b/source/game/StarWorldGeneration.cpp @@ -702,7 +702,7 @@ bool WorldGenerator::entityPersistent(WorldStorage*, EntityPtr const& entity) co RpcPromise<Vec2I> WorldGenerator::enqueuePlacement(List<BiomeItemDistribution> distributions, Maybe<DungeonId> id) { auto promise = RpcPromise<Vec2I>::createPair(); m_queuedPlacements.append(QueuedPlacement { - move(distributions), + std::move(distributions), id, promise.second, false, @@ -829,7 +829,7 @@ void WorldGenerator::generateMicroDungeons(WorldStorage* worldStorage, ServerTil m_worldServer->worldTemplate()->addPotentialBiomeItems(x, y, queuedItems, p.distributions, BiomePlacementArea::Surface); m_worldServer->worldTemplate()->addPotentialBiomeItems(x, y, queuedItems, p.distributions, BiomePlacementArea::Underground); for (auto placement : m_worldServer->worldTemplate()->validBiomeItems(x, y, queuedItems)) - placementQueue.append({move(placement), &p}); + placementQueue.append({std::move(placement), &p}); } } } |