From 31fd5bbc08234686cf798a93a18e0bb73615d1bf Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 1 Sep 2023 22:27:30 +0200 Subject: rename entity -> object --- editor/app.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'editor/app.cpp') diff --git a/editor/app.cpp b/editor/app.cpp index e1e4af39..43e3116c 100644 --- a/editor/app.cpp +++ b/editor/app.cpp @@ -39,7 +39,7 @@ void app::reset_world() void app::ensure_player_character(world& w) { if (_character_id) - if (auto C = w.find_entity(_character_id); C && C->type() == entity_type::character) + if (auto C = w.find_object(_character_id); C && C->type() == object_type::character) return; _character_id = 0; @@ -47,10 +47,10 @@ void app::ensure_player_character(world& w) for (const auto& [coord, c] : w.chunks()) { - for (const auto& e_ : c.entities()) + for (const auto& e_ : c.objects()) { const auto& e = *e_; - if (e.type() == entity_type::character) + if (e.type() == object_type::character) { const auto& C = static_cast(e); if (C.playable) @@ -66,7 +66,7 @@ void app::ensure_player_character(world& w) character_proto cproto; cproto.name = "Player"_s; cproto.playable = true; - _character_id = w.make_entity(w.make_id(), global_coords{}, cproto)->id; + _character_id = w.make_object(w.make_id(), global_coords{}, cproto)->id; } } -- cgit v1.2.3