Skip to content

Commit 60203b6

Browse files
authored
std::move in a few more places (scp-fs2open#7502)
Follow-up to scp-fs2open#7308.
1 parent f184997 commit 60203b6

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

code/model/animation/modelanimation.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,7 +1509,7 @@ namespace animation {
15091509
curve = Curves[curve_id];
15101510
}
15111511

1512-
driver = [remap_driver_source = std::move(remap_driver_source), curve](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi, float) {
1512+
driver = [remap_driver_source = std::move(remap_driver_source), curve = std::move(curve)](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi, float) {
15131513
float oldFrametime = instance.time;
15141514
instance.time = curve ? curve->GetValue(remap_driver_source(pmi)) : remap_driver_source(pmi);
15151515
CLAMP(instance.time, 0.0f, instance.duration);
@@ -1534,7 +1534,7 @@ namespace animation {
15341534
curve = Curves[curve_id];
15351535
}
15361536

1537-
propertyDrivers.emplace_back([driver_source = std::move(driver_source), curve, target](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi) {
1537+
propertyDrivers.emplace_back([driver_source = std::move(driver_source), curve = std::move(curve), target](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi) {
15381538
float& property = instance.*(target.target);
15391539
property = curve ? curve->GetValue(driver_source(pmi)) : driver_source(pmi);
15401540
if(target.clamp) {
@@ -1560,7 +1560,7 @@ namespace animation {
15601560
curve = Curves[curve_id];
15611561
}
15621562

1563-
startupDrivers.emplace_back([driver_source = std::move(driver_source), curve, target](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi) {
1563+
startupDrivers.emplace_back([driver_source = std::move(driver_source), curve = std::move(curve), target](ModelAnimation &, ModelAnimation::instance_data &instance, polymodel_instance *pmi) {
15641564
float& property = instance.*(target.target);
15651565
property = curve ? curve->GetValue(driver_source(pmi)) : driver_source(pmi);
15661566
if(target.clamp) {

code/sound/speech_win.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ SCP_vector<std::pair<int, SCP_string>> speech_enumerate_voices()
253253
SCP_string voiceName;
254254
voiceName.resize(buffer_size);
255255
WideCharToMultiByte(CP_UTF8, 0, id, (int)idlength, &voiceName[0], buffer_size, nullptr, nullptr);
256-
voices.emplace_back(std::make_pair(voiceID++, voiceName));
256+
voices.emplace_back(voiceID++, std::move(voiceName));
257257
}
258258
CoTaskMemFree(id);
259259
}

0 commit comments

Comments
 (0)