summaryrefslogtreecommitdiffhomepage
path: root/src/entity.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-03-21 12:38:27 +0100
committerStanislaw Halik <sthalik@misaki.pl>2023-03-21 12:53:07 +0100
commit0592e91d317ad7bd3224d169dc9b06f438732f30 (patch)
tree11c90d966da24f9ebd5ef4b39bc00092dc388274 /src/entity.cpp
parentc49e460e3c20f7c31ea1068b7d6ac3987f3c4b3b (diff)
src/entity: simplify update() return value
Diffstat (limited to 'src/entity.cpp')
-rw-r--r--src/entity.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/entity.cpp b/src/entity.cpp
index ff0f77a9..4ecd950e 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -153,10 +153,10 @@ bool entity::can_move_to(Vector2i delta)
return can_move_to(delta, coord, offset, bbox_offset, bbox_size);
}
-size_t entity::move_to(size_t i, Vector2i delta, rotation new_r)
+bool entity::move_to(size_t& i, Vector2i delta, rotation new_r)
{
if (!can_rotate(new_r))
- return i;
+ return false;
auto& es = c->_entities;
fm_debug_assert(i < es.size());
@@ -167,7 +167,7 @@ size_t entity::move_to(size_t i, Vector2i delta, rotation new_r)
const auto [coord_, offset_] = normalize_coords(coord, offset, delta);
if (coord_ == coord && offset_ == offset)
- return i;
+ return false;
if (!is_dynamic())
c->mark_scenery_modified();
@@ -186,7 +186,7 @@ size_t entity::move_to(size_t i, Vector2i delta, rotation new_r)
const_cast<rotation&>(r) = new_r;
//for (auto i = 0_uz; const auto& x : es) fm_debug("%zu %s %f", i++, x->atlas->name().data(), x->ordinal());
//fm_debug("insert (%hd;%hd|%hhd;%hhd) %td -> %zu | %f", coord_.chunk().x, coord_.chunk().y, coord_.local().x, coord_.local().y, pos1, es.size(), e.ordinal());
- return i;
+ return false;
}
else
{
@@ -204,7 +204,7 @@ size_t entity::move_to(size_t i, Vector2i delta, rotation new_r)
const_cast<rotation&>(r) = new_r;
const_cast<struct chunk*&>(c) = &c2;
es.insert(it, std::move(e_));
- return ret;
+ return true;
}
}