Saving worldmap position on unstable tiles#3766
Open
joanasaraiva10 wants to merge 4 commits into
Open
Conversation
Author
|
@tobbi Hi! I was wondering if you could check my PR as a few weeks have passed since I opened it. I would also like to know what can I do for the 2 failing checks to pass. |
Member
|
Can you please rebase against master? |
joanasaraiva10
force-pushed
the
fix-saved-paths
branch
from
8df7886 to
8546b2c
Compare
MatusGuy
requested changes
Apr 29, 2026
| m_worldmap->set_passive_message({}, 0.0f); | ||
| } | ||
|
|
||
| if (const auto level = worldmap_sector->at_object<LevelTile>(); level) |
Contributor
There was a problem hiding this comment.
[...]
; level[...]
Pardon?
In general, I would avoid declaring variables in if statements to improve clarity. Even with that in mind, it doesn't even seem like it is necessary in this case.
Suggested change
| if (const auto level = worldmap_sector->at_object<LevelTile>(); level) | |
| if (worldmap_sector->at_object<LevelTile>()) |
Comment on lines
+311
to
+327
| if (const auto level = worldmap_sector->at_object<LevelTile>(); level) | ||
| { | ||
| m_last_level_tile_pos = m_tile_pos; | ||
| m_last_level_back_direction = m_back_direction; | ||
| m_last_stable_tile_pos = m_tile_pos; | ||
| m_last_stable_back_direction = m_back_direction; | ||
| } | ||
| else if (!m_ghost_mode) | ||
| { | ||
| m_last_stable_tile_pos = m_tile_pos; | ||
| m_last_stable_back_direction = m_back_direction; | ||
| } | ||
| else | ||
| { | ||
| m_last_stable_tile_pos = m_last_level_tile_pos; | ||
| m_last_stable_back_direction = m_last_level_back_direction; | ||
| } |
Contributor
There was a problem hiding this comment.
In fact, I believe this could be written in a more concise manner.
Suggested change
| if (const auto level = worldmap_sector->at_object<LevelTile>(); level) | |
| { | |
| m_last_level_tile_pos = m_tile_pos; | |
| m_last_level_back_direction = m_back_direction; | |
| m_last_stable_tile_pos = m_tile_pos; | |
| m_last_stable_back_direction = m_back_direction; | |
| } | |
| else if (!m_ghost_mode) | |
| { | |
| m_last_stable_tile_pos = m_tile_pos; | |
| m_last_stable_back_direction = m_back_direction; | |
| } | |
| else | |
| { | |
| m_last_stable_tile_pos = m_last_level_tile_pos; | |
| m_last_stable_back_direction = m_last_level_back_direction; | |
| } | |
| if (worldmap_sector->at_object<LevelTile>() != nullptr) | |
| { | |
| m_last_level_tile_pos = m_tile_pos; | |
| m_last_level_back_direction = m_back_direction; | |
| } | |
| m_last_stable_tile_pos = m_ghost_mode ? m_last_level_tile_pos : m_tile_pos; | |
| m_last_stable_back_direction = m_ghost_mode ? m_last_level_back_direction : m_back_direction; |
Please make sure to double-check this logic.
When leaving to the main menu, the game saves Tux's current worldmap position even if he is mid-path or on a non-stable tile. Upon reloading, Tux is restored to that invalid position. Save Tux on the last valid "stable" tile (such as a stop or level tile) instead of the current one. Also store the corresponding back direction to keep movement consistent after loading. In ghost mode, avoid persisting invalid tiles by falling back to the last valid level tile. This ensures Tux always respawns on a valid, navigable position.
joanasaraiva10
force-pushed
the
fix-saved-paths
branch
from
2601804 to
9f7cd6c
Compare
Author
|
Hey @MatusGuy, I did the changes you asked me to. Could you check it please? |
MatusGuy
requested changes
May 24, 2026
Comment on lines
+316
to
+321
| tux.set("x", sector.m_tux->get_tile_pos().x); | ||
| tux.set("y", sector.m_tux->get_tile_pos().y); | ||
| tux.set("back", direction_to_string(sector.m_tux->m_back_direction)); | ||
| tux.set("x", save_pos.x); | ||
| tux.set("y", save_pos.y); | ||
| tux.set("back", direction_to_string(save_back)); |
Contributor
There was a problem hiding this comment.
Huh? Which one is it? I'm assuming it's the new one...
Suggested change
| tux.set("x", sector.m_tux->get_tile_pos().x); | |
| tux.set("y", sector.m_tux->get_tile_pos().y); | |
| tux.set("back", direction_to_string(sector.m_tux->m_back_direction)); | |
| tux.set("x", save_pos.x); | |
| tux.set("y", save_pos.y); | |
| tux.set("back", direction_to_string(save_back)); | |
| tux.set("x", save_pos.x); | |
| tux.set("y", save_pos.y); | |
| tux.set("back", direction_to_string(save_back)); |
joanasaraiva10
force-pushed
the
fix-saved-paths
branch
from
9f7cd6c to
c5557b9
Compare
Author
|
hey @MatusGuy can you check it now? I believe I did everything you asked me to. |
MatusGuy
approved these changes
Jun 7, 2026
MatusGuy
left a comment
MatusGuy
left a comment
Contributor
There was a problem hiding this comment.
LGTM (code). Thanks for your contribution!! Just a few code style/formatting nitpicks
Co-authored-by: MatusGuy <85036874+MatusGuy@users.noreply.github.com>
Co-authored-by: MatusGuy <85036874+MatusGuy@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When leaving to the main menu, the game saves Tux's current worldmap position even if he is mid-path or on a non-stable tile. Upon reloading, Tux is restored to that invalid position. Save Tux on the last valid "stable" tile (such as a stop or level tile) instead of the current one. Also store the corresponding back direction to keep movement consistent after loading. In ghost mode, avoid persisting invalid tiles by falling back to the last valid level tile. This ensures Tux always respawns on a valid, navigable position.
Closes #3728