summaryrefslogtreecommitdiffhomepage
path: root/editor/scenery-editor.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-09-01 22:27:30 +0200
committerStanislaw Halik <sthalik@misaki.pl>2023-09-01 22:27:30 +0200
commit31fd5bbc08234686cf798a93a18e0bb73615d1bf (patch)
tree59b964d01885916c5d49fef3c168ff10dcbdd93f /editor/scenery-editor.cpp
parent053ea3aa1c443c368f8b43591e3e970e12b50c70 (diff)
rename entity -> object
Diffstat (limited to 'editor/scenery-editor.cpp')
-rw-r--r--editor/scenery-editor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/scenery-editor.cpp b/editor/scenery-editor.cpp
index 66ff94bb..19a24e99 100644
--- a/editor/scenery-editor.cpp
+++ b/editor/scenery-editor.cpp
@@ -85,14 +85,14 @@ void scenery_editor::place_tile(world& w, global_coords pos, const scenery_& s,
if (!s)
{
auto [c, t] = w[pos];
- const auto& es = c.entities();
+ const auto& es = c.objects();
start: while (auto id = a.object_at_cursor())
{
for (auto i = es.size()-1; i != (size_t)-1; i--)
{
if (es[i]->id == id)
{
- c.remove_entity(i);
+ c.remove_object(i);
goto start;
}
}
@@ -101,7 +101,7 @@ start: while (auto id = a.object_at_cursor())
}
else
// todo check collision at pos
- w.make_entity<scenery>(w.make_id(), pos, s.proto);
+ w.make_object<scenery>(w.make_id(), pos, s.proto);
}
} // namespace floormat