WorldMapObject: Do not update tile position every frame, ensure tile position stays valid in Editor

Makes a few changes to `WorldMapObject`, revolving around making it not have to `update()` its tile position based on sector position every frame:

* Overrides `set_pos()`, `move_to()` and `move()` from `MovingObject` to instead move the object to a floored tile position. This also ensures that positions set via scripting will continue to be floored as well.
* Updates tile position based on sector position in `after_editor_set()` for undo/redo support and allowing for X and Y tile position to be set via the object option (applicable for the properties sidebar, not merged into master yet).

Author: Vankata453

src/worldmap/worldmap_object.cpp

@@ -57,13 +57,11 @@ void
 WorldMapObject::initialize()
 {
   // Set sector position from provided tile position
-  set_pos(Vector(32.0f * m_col.m_bbox.get_left() +
+  m_col.m_bbox.set_pos(Vector(32.0f * m_col.m_bbox.get_left() +
                     (m_col.m_bbox.get_width() < 32.f ? (32.f - m_col.m_bbox.get_width()) / 2 : 0),
-                 32.0f * m_col.m_bbox.get_top() +
-                    (m_col.m_bbox.get_width() < 32.f ? (32.f - m_col.m_bbox.get_height()) / 2 : 0)));
-
+                       32.0f * m_col.m_bbox.get_top() +
+                    (m_col.m_bbox.get_height() < 32.f ? (32.f - m_col.m_bbox.get_height()) / 2 : 0)));
   update_pos();
-  update_hitbox();
 }
 
 ObjectSettings
@@ -107,9 +105,15 @@ WorldMapObject::draw_normal(DrawingContext& context)
 }
 
 void
-WorldMapObject::update(float)
+WorldMapObject::after_editor_set()
 {
-  update_pos();
+  MovingSprite::after_editor_set();
+
+  // Set sector position from provided tile position
+  m_col.m_bbox.set_pos(Vector(32.0f * m_tile_x +
+                    (m_col.m_bbox.get_width() < 32.f ? (32.f - m_col.m_bbox.get_width()) / 2 : 0),
+                       32.0f * m_tile_y +
+                    (m_col.m_bbox.get_height() < 32.f ? (32.f - m_col.m_bbox.get_height()) / 2 : 0)));
 }
 
 void
@@ -120,14 +124,33 @@ WorldMapObject::update_pos()
 }
 
 void
-WorldMapObject::move_to(const Vector& pos)
+WorldMapObject::update_pos(const Vector& pos)
 {
   // Set sector position to the provided position, rounding it to be divisible by 32
-  set_pos(Vector(32.0f * static_cast<float>(pos.x / 32) +
+  m_col.m_bbox.set_pos(Vector(32.0f * static_cast<int>(pos.x / 32) +
                     (m_col.m_bbox.get_width() < 32.f ? (32.f - m_col.m_bbox.get_width()) / 2 : 0),
-                 32.0f * static_cast<float>(pos.y / 32) +
-                    (m_col.m_bbox.get_width() < 32.f ? (32.f - m_col.m_bbox.get_height()) / 2 : 0)));
+                       32.0f * static_cast<int>(pos.y / 32) +
+                    (m_col.m_bbox.get_height() < 32.f ? (32.f - m_col.m_bbox.get_height()) / 2 : 0)));
   update_pos();
 }
 
+void
+WorldMapObject::set_pos(const Vector& pos)
+{
+  update_pos(pos);
+}
+
+void
+WorldMapObject::move_to(const Vector& pos)
+{
+  update_pos(pos);
+}
+
+void
+WorldMapObject::move(const Vector& dist)
+{
+  m_col.m_bbox.move(dist);
+  update_pos(m_col.m_bbox.p1());
+}
+
 } // namespace worldmap

src/worldmap/worldmap_object.hpp

@@ -45,19 +45,23 @@ class WorldMapObject : public MovingSprite
   /** Draws the object, when on a worldmap. */
   virtual void draw_worldmap(DrawingContext& context);
 
-  void update(float) override;
-
   virtual HitResponse collision(MovingObject& other, const CollisionHit& hit) override { return FORCE_MOVE; }
   virtual ObjectSettings get_settings() override;
-  virtual void move_to(const Vector& pos) override;
+  void after_editor_set() override;
+
+  void set_pos(const Vector& pos) override;
+  void move_to(const Vector& pos) override;
+  void move(const Vector& dist) override;
 
   inline Vector get_tile_pos() const { return { m_tile_x, m_tile_y }; }
 
 private:
   void initialize();
 
   void draw_normal(DrawingContext& context);
+
   void update_pos();
+  void update_pos(const Vector& pos);
 
 private:
   int m_tile_x;