diff options
Diffstat (limited to 'source/game/items/StarActiveItem.cpp')
| -rw-r--r-- | source/game/items/StarActiveItem.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/game/items/StarActiveItem.cpp b/source/game/items/StarActiveItem.cpp index 49e82be..102ad16 100644 --- a/source/game/items/StarActiveItem.cpp +++ b/source/game/items/StarActiveItem.cpp @@ -182,7 +182,7 @@ List<DamageSource> ActiveItem::damageSources() const { line.flipHorizontal(0.0f); line.translate(handPosition(Vec2F())); } - damageSources.append(move(ds)); + damageSources.append(std::move(ds)); } return damageSources; } @@ -194,7 +194,7 @@ List<PolyF> ActiveItem::shieldPolys() const { if (owner()->facingDirection() == Direction::Left) sp.flipHorizontal(0.0f); sp.translate(handPosition(Vec2F())); - shieldPolys.append(move(sp)); + shieldPolys.append(std::move(sp)); } return shieldPolys; } @@ -213,7 +213,7 @@ List<PhysicsForceRegion> ActiveItem::forceRegions() const { rfr->center[0] *= -1; rfr->center += owner()->position() + handPosition(Vec2F()); } - forceRegions.append(move(fr)); + forceRegions.append(std::move(fr)); } return forceRegions; } @@ -276,7 +276,7 @@ List<LightSource> ActiveItem::lights() const { else light.beamAngle = -Constants::pi / 2 - constrainAngle(light.beamAngle + Constants::pi / 2); } - result.append(move(light)); + result.append(std::move(light)); } result.appendAll(m_scriptedAnimator.lightSources()); return result; @@ -294,7 +294,7 @@ List<AudioInstancePtr> ActiveItem::pullNewAudios() { for (auto& audio : m_itemAnimatorDynamicTarget.pullNewAudios()) { m_activeAudio[audio] = *audio->position(); audio->setPosition(owner()->position() + handPosition(*audio->position())); - result.append(move(audio)); + result.append(std::move(audio)); } result.appendAll(m_scriptedAnimator.pullNewAudios()); return result; @@ -310,7 +310,7 @@ List<Particle> ActiveItem::pullNewParticles() { particle.velocity[0] *= -1; particle.flip = !particle.flip; } - result.append(move(particle)); + result.append(std::move(particle)); } result.appendAll(m_scriptedAnimator.pullNewParticles()); return result; @@ -462,20 +462,20 @@ LuaCallbacks ActiveItem::makeActiveItemCallbacks() { }); callbacks.registerCallback("setCursor", [this](Maybe<String> cursor) { - m_cursor = move(cursor); + m_cursor = std::move(cursor); }); callbacks.registerCallback("setScriptedAnimationParameter", [this](String name, Json value) { - m_scriptedAnimationParameters.set(move(name), move(value)); + m_scriptedAnimationParameters.set(std::move(name), std::move(value)); }); callbacks.registerCallback("setInventoryIcon", [this](String image) { setInstanceValue("inventoryIcon", image); - setIconDrawables({Drawable::makeImage(move(image), 1.0f, true, Vec2F())}); + setIconDrawables({Drawable::makeImage(std::move(image), 1.0f, true, Vec2F())}); }); callbacks.registerCallback("setInstanceValue", [this](String name, Json val) { - setInstanceValue(move(name), move(val)); + setInstanceValue(std::move(name), std::move(val)); }); callbacks.registerCallback("callOtherHandScript", [this](String const& func, LuaVariadic<LuaValue> const& args) { |