[NO SQUASH] (cherry pick) Don't call GameSession::restart_level in the constructor #3115
+21
−21
Conversation
This file contains 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
This stops testing/the title screen (yes, the title screen) from reparsing the level by simply changing the usage pattern of the TitleScreen. (Cherry picked from swagtoy/supertux:editor2)
|
wait hold on there's a regression where you can control Tux from the title screen |
|
Okay, seems to work! Later i'll actually end up probably creating an |
swagtoy
changed the title
Vankata453
reviewed
Nov 29, 2024
swagtoy
changed the title
Vankata453
reviewed
Nov 29, 2024
|
Seems good now. I did test some things and it doesn't crash and burn. Any final words? |
|
Vankata453
reviewed
Nov 30, 2024
| @@ -354,10 +354,13 @@ WorldMapSector::update(float dt_sec) | |||
| Vector shrinkpos = Vector(level_->get_pos().x + 16 - m_camera->get_offset().x, | |||
| level_->get_pos().y + 8 - m_camera->get_offset().y); | |||
| std::string levelfile = m_parent.m_levels_path + level_->get_level_filename(); | |||
|
|
|||
| auto gamesession = std::make_unique<GameSession>(levelfile, m_parent.m_savegame, &level_->get_statistics()); | |||
| gamesession->restart_level(); | |||
There was a problem hiding this comment.
We can put a try/catch here so the game doesn't crash if level loading fails. You can then put the pop_screen() there in catch instead.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This stops testing (on the "Test from here")/the title screen (yes, the title screen) from reparsing the level by simply changing the usage pattern of the GameSession constructor.
Cherry picked from commit swagtoy@0d25b71 upon the request of Vankata.