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/StarTileSectorArray.hpp | |
| parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
| parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) | |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarTileSectorArray.hpp')
| -rw-r--r-- | source/game/StarTileSectorArray.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/game/StarTileSectorArray.hpp b/source/game/StarTileSectorArray.hpp index 40378db..fb96229 100644 --- a/source/game/StarTileSectorArray.hpp +++ b/source/game/StarTileSectorArray.hpp @@ -146,7 +146,7 @@ TileSectorArray<Tile, SectorSize>::TileSectorArray() {} template <typename Tile, unsigned SectorSize> TileSectorArray<Tile, SectorSize>::TileSectorArray(Vec2U const& size, Tile defaultTile) { - init(size, move(defaultTile)); + init(size, std::move(defaultTile)); } template <typename Tile, unsigned SectorSize> @@ -154,7 +154,7 @@ void TileSectorArray<Tile, SectorSize>::init(Vec2U const& size, Tile defaultTile m_worldSize = size; // Initialize to enough sectors to fit world size at least. m_tileSectors.init((size[0] + SectorSize - 1) / SectorSize, (size[1] + SectorSize - 1) / SectorSize); - m_default = move(defaultTile); + m_default = std::move(defaultTile); } template <typename Tile, unsigned SectorSize> @@ -210,13 +210,13 @@ auto TileSectorArray<Tile, SectorSize>::adjacentSector(Sector const& sector, Vec template <typename Tile, unsigned SectorSize> void TileSectorArray<Tile, SectorSize>::loadSector(Sector const& sector, ArrayPtr tile) { if (sectorValid(sector)) - m_tileSectors.loadSector(sector, move(tile)); + m_tileSectors.loadSector(sector, std::move(tile)); } template <typename Tile, unsigned SectorSize> void TileSectorArray<Tile, SectorSize>::loadDefaultSector(Sector const& sector) { if (sectorValid(sector)) - m_tileSectors.loadSector(sector, make_unique<Array>(m_default)); + m_tileSectors.loadSector(sector, std::make_unique<Array>(m_default)); } template <typename Tile, unsigned SectorSize> |