Fix offset calculations for tilemaps when saving

Author: tobbi

src/object/tilemap.cpp

@@ -27,6 +27,7 @@
 #include "supertux/debug.hpp"
 #include "supertux/gameconfig.hpp"
 #include "supertux/globals.hpp"
+#include "supertux/level.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/sector.hpp"
 #include "supertux/tile.hpp"
@@ -53,7 +54,7 @@ TileMap::TileMap(const TileSet *new_tileset) :
   m_width(0),
   m_height(0),
   m_z_pos(0),
-  m_offset(Vector(0, 32)),
+  m_offset(Vector(0, 0)),
   m_movement(0, 0),
   m_objects_hit_bottom(),
   m_ground_movement_manager(nullptr),
@@ -87,7 +88,7 @@ TileMap::TileMap(const TileSet *tileset_, const ReaderMapping& reader) :
   m_width(-1),
   m_height(-1),
   m_z_pos(0),
-  m_offset(Vector(0, 32)),
+  m_offset(Vector(0, 0)),
   m_movement(Vector(0, 0)),
   m_objects_hit_bottom(),
   m_ground_movement_manager(nullptr),
@@ -393,7 +394,7 @@ TileMap::after_editor_set()
     }
   } else {
     if (m_add_path) {
-      init_path_pos(m_offset);
+      init_path_pos(get_offset());
     }
   }
 
@@ -677,15 +678,27 @@ TileMap::resize(int new_width, int new_height, int fill_id,
     apply_offset_y(fill_id, yoffset);
 }
 
-void TileMap::resize(const Size& newsize, const Size& resize_offset) {
+void
+TileMap::resize(const Size& newsize, const Size& resize_offset) {
   resize(newsize.width, newsize.height, 0, resize_offset.width, resize_offset.height);
 }
 
+Vector
+TileMap::get_offset() const
+{
+  // Apply custom offset for tilemap to fit buttons at the top of the editor. 
+  // This extra offset isn't saved.
+  if (Editor::is_active() && !Level::current()->is_saving_in_progress())
+    return m_offset + Vector(0, 32);
+
+  return m_offset;
+}
+
 Rect
 TileMap::get_tiles_overlapping(const Rectf &rect) const
 {
   Rectf rect2 = rect;
-  rect2.move(-m_offset);
+  rect2.move(-get_offset());
 
   int t_left   = std::max(0     , int(floorf(rect2.get_left  () / 32)));
   int t_right  = std::min(m_width , int(ceilf (rect2.get_right () / 32)));
@@ -738,7 +751,7 @@ TileMap::get_tile_id(const Vector& pos) const
 bool
 TileMap::is_outside_bounds(const Vector& pos) const
 {
-  auto pos_ = (pos - m_offset) / 32.0f;
+  auto pos_ = (pos - get_offset()) / 32.0f;
   float width = static_cast<float>(m_width);
   float height = static_cast<float>(m_height);
   return pos_.x < 0 || pos_.x >= width || pos_.y < 0 || pos_.y >= height;
@@ -754,7 +767,7 @@ TileMap::get_tile(int x, int y) const
 uint32_t
 TileMap::get_tile_id_at(const Vector& pos) const
 {
-  Vector xy = (pos - m_offset) / 32.0f;
+  Vector xy = (pos - get_offset()) / 32.0f;
   return get_tile_id(static_cast<int>(xy.x), static_cast<int>(xy.y));
 }
 
@@ -789,7 +802,7 @@ TileMap::change(int idx, uint32_t newtile)
 void
 TileMap::change_at(const Vector& pos, uint32_t newtile)
 {
-  Vector xy = (pos - m_offset) / 32.0f;
+  Vector xy = (pos - get_offset()) / 32.0f;
   change(int(xy.x), int(xy.y), newtile);
 }
 
@@ -1021,11 +1034,11 @@ void
 TileMap::move_by(const Vector& shift)
 {
   if (!get_path()) {
-    init_path_pos(m_offset);
+    init_path_pos(get_offset());
     m_add_path = true;
   }
   get_path()->move_by(shift);
-  m_offset += shift;
+  set_offset(get_offset() + shift);
 }
 
 void

src/object/tilemap.hpp

@@ -101,7 +101,7 @@ class TileMap final : public LayerObject,
   inline Size get_size() const { return Size(m_width, m_height); }
 
   inline void set_offset(const Vector &offset_) { m_offset = offset_; }
-  inline Vector get_offset() const { return m_offset; }
+  Vector get_offset() const;
 
   void set_ground_movement_manager(const std::shared_ptr<CollisionGroundMovementManager>& movement_manager)
   {
@@ -126,7 +126,7 @@ class TileMap final : public LayerObject,
   /** Returns the position of the upper-left corner of tile (x, y) in
       the sector. */
   Vector get_tile_position(int x, int y) const
-  { return m_offset + Vector(static_cast<float>(x), static_cast<float>(y)) * 32.0f; }
+  { return get_offset() + Vector(static_cast<float>(x), static_cast<float>(y)) * 32.0f; }
 
   Rectf get_bbox() const {
     return Rectf(get_tile_position(0, 0),

src/supertux/level.cpp

@@ -54,7 +54,8 @@ Level::Level(bool worldmap) :
   m_skip_cutscene(false),
   m_icon(),
   m_icon_locked(),
-  m_wmselect_bkg()
+  m_wmselect_bkg(),
+  m_saving_in_progress(false)
 {
   s_current = this;
 
@@ -174,6 +175,8 @@ Level::save(const std::string& filepath, bool retry)
 void
 Level::save(Writer& writer)
 {
+  m_saving_in_progress = true;
+
   writer.start_list("supertux-level");
   // Starts writing to supertux level file. Keep this at the very beginning.
 
@@ -220,6 +223,8 @@ Level::save(Writer& writer)
 
   // Ends writing to supertux level file. Keep this at the very end.
   writer.end_list("supertux-level");
+
+  m_saving_in_progress = false;
 }
 
 std::string

src/supertux/level.hpp

@@ -64,6 +64,8 @@ class Level final
   int get_total_badguys() const;
   int get_total_secrets() const;
 
+  bool is_saving_in_progress() const { return m_saving_in_progress; }
+
   void reactivate();
 
   inline bool is_worldmap() const { return m_is_worldmap; }
@@ -114,6 +116,9 @@ class Level final
   std::string m_icon_locked;
   std::string m_wmselect_bkg;
 
+private:
+  bool m_saving_in_progress;
+
 private:
   Level(const Level&) = delete;
   Level& operator=(const Level&) = delete;