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/StarObjectDatabase.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarObjectDatabase.cpp')
-rw-r--r-- | source/game/StarObjectDatabase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/game/StarObjectDatabase.cpp b/source/game/StarObjectDatabase.cpp index d886be8..68ec6a9 100644 --- a/source/game/StarObjectDatabase.cpp +++ b/source/game/StarObjectDatabase.cpp @@ -300,7 +300,7 @@ List<ObjectOrientationPtr> ObjectDatabase::parseOrientations(String const& path, orientation->touchDamageConfig = parseTouchDamage(path, orientationSettings); - res.append(move(orientation)); + res.append(std::move(orientation)); } return res; @@ -584,7 +584,7 @@ List<Drawable> ObjectDatabase::cursorHintDrawables(World const* world, String co image = AssetPath::join(image).replaceTags(StringMap<String>(), true, "default"); if (orientation->flipImages) drawable.scale(Vec2F(-1, 1), drawable.boundBox(false).center() - drawable.position); - drawables.append(move(drawable)); + drawables.append(std::move(drawable)); } Drawable::translateAll(drawables, Vec2F(position) + orientation->imagePosition); } |