Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/game/StarDrawable.cpp
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2024-02-20 09:49:42 +1100
committerGitHub <noreply@github.com>2024-02-20 09:49:42 +1100
commitaa987a217779e71f97ee4c9cce531aec1c861bf8 (patch)
treee51fcce110306d93bf93870f13a5ff7d6b575427 /source/game/StarDrawable.cpp
parentd0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff)
parent1c89042016c739815b2d70bcbef4673eef6b63e0 (diff)
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarDrawable.cpp')
-rw-r--r--source/game/StarDrawable.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/game/StarDrawable.cpp b/source/game/StarDrawable.cpp
index 08c14be..2c527a5 100644
--- a/source/game/StarDrawable.cpp
+++ b/source/game/StarDrawable.cpp
@@ -70,7 +70,7 @@ Drawable::ImagePart& Drawable::ImagePart::removeDirectives(bool keepImageCenterP
Drawable Drawable::makeLine(Line2F const& line, float lineWidth, Color const& color, Vec2F const& position) {
Drawable drawable;
- drawable.part = LinePart{move(line), lineWidth};
+ drawable.part = LinePart{std::move(line), lineWidth};
drawable.color = color;
drawable.position = position;
@@ -79,7 +79,7 @@ Drawable Drawable::makeLine(Line2F const& line, float lineWidth, Color const& co
Drawable Drawable::makePoly(PolyF poly, Color const& color, Vec2F const& position) {
Drawable drawable;
- drawable.part = PolyPart{move(poly)};
+ drawable.part = PolyPart{std::move(poly)};
drawable.color = color;
drawable.position = position;
@@ -98,7 +98,7 @@ Drawable Drawable::makeImage(AssetPath image, float pixelSize, bool centered, Ve
if (pixelSize != 1.0f)
transformation.scale(pixelSize);
- drawable.part = ImagePart{move(image), move(transformation)};
+ drawable.part = ImagePart{std::move(image), std::move(transformation)};
drawable.position = position;
drawable.color = color;
@@ -132,7 +132,7 @@ Drawable::Drawable(Json const& json) {
transformation.scale(*scale);
}
- part = ImagePart{move(imageString), move(transformation)};
+ part = ImagePart{std::move(imageString), std::move(transformation)};
}
position = json.opt("position").apply(jsonToVec2F).value();
color = json.opt("color").apply(jsonToColor).value(Color::White);