Fix "Test from here" position being overriden by save file

SuperTux · Jul 19, 2023 · b35f247 · b35f247
1 parent 36c8ca7
commit b35f247
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/supertux/game_manager.cpp b/src/supertux/game_manager.cpp
@@ -92,7 +92,7 @@ GameManager::start_worldmap(const World& world, const std::string& worldmap_file
 {
   start_worldmap(world, worldmap_filename, start_pos ? start_pos->first : "");
   if (start_pos)
-    worldmap::WorldMapSector::current()->get_tux().set_pos(start_pos->second);
+    worldmap::WorldMapSector::current()->get_tux().set_initial_pos(start_pos->second);
 }
 
 bool

diff --git a/src/worldmap/tux.cpp b/src/worldmap/tux.cpp
@@ -46,7 +46,8 @@ Tux::Tux(WorldMap* worldmap) :
   m_controller(InputManager::current()->get_controller()),
   m_input_direction(Direction::NONE),
   m_direction(Direction::NONE),
-  m_tile_pos(0.0f, 0.0f),
+  m_initial_tile_pos(),
+  m_tile_pos(),
   m_offset(0),
   m_moving(false),
   m_ghost_mode(false)
@@ -371,6 +372,10 @@ Tux::update(float dt_sec)
 void
 Tux::setup()
 {
+  // Set initial tile position, if provided
+  if (m_initial_tile_pos != Vector())
+    m_tile_pos = m_initial_tile_pos;
+
   // check if we already touch a SpriteChange object
   auto sprite_change = m_worldmap->get_sector().at_object<SpriteChange>(m_tile_pos);
   change_sprite(sprite_change);

diff --git a/src/worldmap/tux.hpp b/src/worldmap/tux.hpp
@@ -51,7 +51,7 @@ class Tux final : public GameObject
   Vector get_pos() const;
   Vector get_axis() const;
   Vector get_tile_pos() const { return m_tile_pos; }
-  void set_pos(const Vector& pos) { m_tile_pos = pos / 32.f; }
+  void set_initial_pos(const Vector& pos) { m_initial_tile_pos = pos / 32.f; }
   void set_tile_pos(const Vector& pos) { m_tile_pos = pos; }
 
   void process_special_tile(SpecialTile* special_tile);
@@ -76,6 +76,7 @@ class Tux final : public GameObject
 
   Direction m_input_direction;
   Direction m_direction;
+  Vector m_initial_tile_pos;
   Vector m_tile_pos;
   /** Length by which tux is away from its current tile, length is in
       input_direction direction */