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/objects/StarPhysicsObject.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/objects/StarPhysicsObject.cpp')
-rw-r--r-- | source/game/objects/StarPhysicsObject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/game/objects/StarPhysicsObject.cpp b/source/game/objects/StarPhysicsObject.cpp index f327473..9da604d 100644 --- a/source/game/objects/StarPhysicsObject.cpp +++ b/source/game/objects/StarPhysicsObject.cpp @@ -7,7 +7,7 @@ namespace Star { -PhysicsObject::PhysicsObject(ObjectConfigConstPtr config, Json const& parameters) : Object(move(config), parameters) { +PhysicsObject::PhysicsObject(ObjectConfigConstPtr config, Json const& parameters) : Object(std::move(config), parameters) { for (auto const& p : configValue("physicsForces", JsonObject()).iterateObject()) { auto& forceConfig = m_physicsForces[p.first]; @@ -60,7 +60,7 @@ void PhysicsObject::init(World* world, EntityId entityId, EntityMode mode) { auto& collisionConfig = m_physicsCollisions.get(collision); collisionConfig.enabled.set(enabled); }); - m_scriptComponent.addCallbacks("physics", move(physicsCallbacks)); + m_scriptComponent.addCallbacks("physics", std::move(physicsCallbacks)); } Object::init(world, entityId, mode); m_metaBoundBox = Object::metaBoundBox(); @@ -92,7 +92,7 @@ List<PhysicsForceRegion> PhysicsObject::forceRegions() const { if (p.second.enabled.get()) { PhysicsForceRegion forceRegion = p.second.forceRegion; forceRegion.call([pos = position()](auto& fr) { fr.translate(pos); }); - forces.append(move(forceRegion)); + forces.append(std::move(forceRegion)); } } return forces; |