diff options
Diffstat (limited to 'source/game/StarWorldStorage.cpp')
-rw-r--r-- | source/game/StarWorldStorage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/game/StarWorldStorage.cpp b/source/game/StarWorldStorage.cpp index 869a830..08cf55c 100644 --- a/source/game/StarWorldStorage.cpp +++ b/source/game/StarWorldStorage.cpp @@ -45,7 +45,7 @@ WorldChunks WorldStorage::getWorldChunksFromFile(String const& file) { openDatabase(db, File::open(file, IOMode::Read)); WorldChunks chunks; - db.forAll([&chunks](ByteArray key, ByteArray value) { chunks.add(move(key), move(value)); }); + db.forAll([&chunks](ByteArray key, ByteArray value) { chunks.add(std::move(key), std::move(value)); }); return chunks; } @@ -203,7 +203,7 @@ void WorldStorage::triggerTerraformSector(Sector sector) { } RpcPromise<Vec2I> WorldStorage::enqueuePlacement(List<BiomeItemDistribution> distributions, Maybe<DungeonId> id) { - return m_generatorFacade->enqueuePlacement(move(distributions), id); + return m_generatorFacade->enqueuePlacement(std::move(distributions), id); } Maybe<float> WorldStorage::sectorTimeToLive(Sector sector) const { @@ -405,7 +405,7 @@ WorldChunks WorldStorage::readChunks() { WorldChunks chunks; m_db.forAll([&chunks](ByteArray k, ByteArray v) { - chunks.add(move(k), move(v)); + chunks.add(std::move(k), std::move(v)); }); return WorldChunks(chunks); @@ -578,7 +578,7 @@ ByteArray WorldStorage::writeSectorUniqueStore(SectorUniqueStore const& store) { void WorldStorage::openDatabase(BTreeDatabase& db, IODevicePtr device) { db.setContentIdentifier("World4"); db.setKeySize(5); - db.setIODevice(move(device)); + db.setIODevice(std::move(device)); db.setBlockSize(2048); db.setAutoCommit(false); db.open(); @@ -740,9 +740,9 @@ void WorldStorage::unloadSectorToLevel(Sector const& sector, SectorLoadLevel tar return; if (m_generatorFacade->entityPersistent(this, entity)) - entitiesToStore.append(move(entity)); + entitiesToStore.append(std::move(entity)); else - entitiesToRemove.append(move(entity)); + entitiesToRemove.append(std::move(entity)); } for (auto const& entity : entitiesToRemove) { |