diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:47:10 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:47:10 +1100 |
commit | 1c89042016c739815b2d70bcbef4673eef6b63e0 (patch) | |
tree | f7c8e96e744222857c613e5fd14720d2695613c3 /source/game/StarMovementController.cpp | |
parent | 30e1871d3f44629e00a1f66d8164e3e62c7f889f (diff) | |
parent | 7c4fbad2ba7d79580a9ebbf9fde1de117be4d08e (diff) |
Merge pull request #19 from kblaschke/fix-compiler-warnings
Fixed a huge amount of Clang warnings
Diffstat (limited to 'source/game/StarMovementController.cpp')
-rw-r--r-- | source/game/StarMovementController.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/game/StarMovementController.cpp b/source/game/StarMovementController.cpp index a9b626f..88ac69f 100644 --- a/source/game/StarMovementController.cpp +++ b/source/game/StarMovementController.cpp @@ -721,7 +721,7 @@ void MovementController::forEachMovingCollision(RectF const& region, function<bo for (size_t i = 0; i < physicsEntity->movingCollisionCount(); ++i) { if (auto mc = physicsEntity->movingCollision(i)) { if (mc->categoryFilter.check(m_parameters.physicsEffectCategories.value())) { - PolyF poly = move(mc->collision); + PolyF poly = std::move(mc->collision); poly.translate(geometry.nearestTo(region.min(), mc->position)); RectF polyBounds = poly.boundBox(); @@ -1055,7 +1055,7 @@ MovementController::CollisionSeparation MovementController::collisionSeparate(Li } void MovementController::updateParameters(MovementParameters parameters) { - m_parameters = move(parameters); + m_parameters = std::move(parameters); m_collisionPoly.set(*m_parameters.collisionPoly); m_mass.set(*m_parameters.mass); updatePositionInterpolators(); @@ -1106,7 +1106,7 @@ void MovementController::queryCollisions(RectF const& region) { forEachMovingCollision(region, [&](MovingCollisionId id, PhysicsMovingCollision mc, PolyF poly, RectF bounds) { CollisionPoly& collisionPoly = newCollisionPoly(); - collisionPoly.poly = move(poly); + collisionPoly.poly = std::move(poly); collisionPoly.polyBounds = bounds; collisionPoly.sortPosition = collisionPoly.poly.center(); collisionPoly.movingCollisionId = id; |