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/StarMaterialRenderProfile.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarMaterialRenderProfile.cpp')
-rw-r--r-- | source/game/StarMaterialRenderProfile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/game/StarMaterialRenderProfile.cpp b/source/game/StarMaterialRenderProfile.cpp index a763f61..975e7fa 100644 --- a/source/game/StarMaterialRenderProfile.cpp +++ b/source/game/StarMaterialRenderProfile.cpp @@ -33,7 +33,7 @@ MaterialRenderMatchList parseMaterialRenderMatchList(Json const& matchSpec, Rule throw MaterialRenderProfileException(strf("Match position {} outside of maximum rule distance {}", matchPoint.position, MaterialRenderProfileMaxNeighborDistance)); matchPoint.rule = ruleMap.get(matchPointConfig.getString(1)); - match->matchPoints.append(move(matchPoint)); + match->matchPoints.append(std::move(matchPoint)); } for (auto const& piece : matchConfig.getArray("pieces", {})) @@ -105,7 +105,7 @@ MaterialRenderProfile parseMaterialRenderProfile(Json const& spec, String const& rule->entries.append({MaterialRule::RulePropertyEquals{ruleEntry.getString("propertyName"), ruleEntry.get("propertyValue")}, inverse}); } } - profile.rules[pair.first] = move(rule); + profile.rules[pair.first] = std::move(rule); } for (auto const& pair : spec.get("pieces").iterateObject()) { @@ -137,7 +137,7 @@ MaterialRenderProfile parseMaterialRenderProfile(Json const& spec, String const& } } - profile.pieces[pair.first] = move(renderPiece); + profile.pieces[pair.first] = std::move(renderPiece); } for (auto const& pair : spec.get("matches").iterateArray()) |