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/StarCollisionGenerator.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarCollisionGenerator.cpp')
-rw-r--r-- | source/game/StarCollisionGenerator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/game/StarCollisionGenerator.cpp b/source/game/StarCollisionGenerator.cpp index d7606dd..d9e7af7 100644 --- a/source/game/StarCollisionGenerator.cpp +++ b/source/game/StarCollisionGenerator.cpp @@ -33,9 +33,9 @@ void CollisionGenerator::getBlocksPlatforms(List<CollisionBlock>& list, RectI co CollisionBlock block; block.space = Vec2I(x, y); block.kind = kind; - block.poly = PolyF(move(vertices)); + block.poly = PolyF(std::move(vertices)); block.polyBounds = block.poly.boundBox(); - list.append(move(block)); + list.append(std::move(block)); }; // This was once simple and elegant and made sense but then I made it @@ -151,7 +151,7 @@ void CollisionGenerator::getBlocksMarchingSquares(List<CollisionBlock>& list, Re } block.polyBounds = block.poly.boundBox(); block.kind = std::max({collisionKind(x, y), collisionKind(x + 1, y), collisionKind(x, y + 1), collisionKind(x + 1, y + 1)}); - list.append(move(block)); + list.append(std::move(block)); }; int xMin = region.xMin(); |