remove return value from object::move_to

2 files changed, 4 insertions, 6 deletions

diff --git a/src/object.cpp b/src/object.cpp
index 1dc05f4b..d0c4da57 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -187,10 +187,10 @@ bool object::can_move_to(Vector2i delta)
     return can_move_to(delta, coord, offset, bbox_offset, bbox_size);
 }
 
-size_t object::move_to(size_t& i, Vector2i delta, rotation new_r)
+void object::move_to(size_t& i, Vector2i delta, rotation new_r)
 {
     if (!can_rotate(new_r))
-        return i;
+        return;
 
     auto& es = c->_objects;
     fm_debug_assert(i < es.size());
@@ -201,7 +201,7 @@ size_t object::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;
 
     if (!is_dynamic())
         c->mark_scenery_modified();
@@ -238,8 +238,6 @@ size_t object::move_to(size_t& i, Vector2i delta, rotation new_r)
         i = (size_t)std::distance(es.cbegin(), it);
         es.insert(it, std::move(e_));
     }
-
-    return i;
 }
 
 void object::move_to(Magnum::Vector2i delta)
diff --git a/src/object.hpp b/src/object.hpp
index f411a7ec..cbd9bcde 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -78,7 +78,7 @@ struct object
     virtual bool is_dynamic() const;
     bool can_rotate(rotation new_r);
     bool can_move_to(Vector2i delta);
-    size_t move_to(size_t& i, Vector2i delta, rotation new_r);
+    void move_to(size_t& i, Vector2i delta, rotation new_r);
     void move_to(Vector2i delta);
 
 protected: