From b59b5bb320309f0d934ab9bc24d35c63b641b169 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 4 Mar 2024 05:25:30 +0100 Subject: src: fix incorrect std::move usage --- src/critter.cpp | 4 ++-- src/world.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/critter.cpp b/src/critter.cpp index b187c33a..490aa757 100644 --- a/src/critter.cpp +++ b/src/critter.cpp @@ -212,9 +212,9 @@ critter::operator critter_proto() const return ret; } -critter::critter(object_id id, class chunk& c, critter_proto proto) : // todo! check if it gets move-constructed +critter::critter(object_id id, class chunk& c, critter_proto proto) : object{id, c, proto}, - name{proto.name}, + name{move(proto.name)}, speed{proto.speed}, playable{proto.playable} { diff --git a/src/world.cpp b/src/world.cpp index d75a835d..adbcf540 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -251,7 +251,7 @@ shared_ptr_wrapper world::ensure_player_character(object_id& id_, critt else { p.playable = true; - ret.ptr = make_object(make_id(), global_coords{}, p); + ret.ptr = make_object(make_id(), global_coords{}, move(p)); id_ = ret.ptr->id; } fm_debug_assert(ret.ptr); -- cgit v1.2.3