Additional information can now be specified for levels. #1729
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
slackstone
reviewed
Apr 21, 2021
tobbi
requested changes
Apr 22, 2021
src/supertux/level_parser.cpp
Outdated
| @@ -167,6 +167,7 @@ LevelParser::load(const ReaderDocument& doc) | |||
| level.get("license", m_level.m_license); | |||
| level.get("target-time", m_level.m_target_time); | |||
| level.get("suppress-pause-menu", m_level.m_suppress_pause_menu); | |||
| level.get("note",m_level.m_note); | |||
src/supertux/levelintro.cpp
Outdated
| @@ -182,6 +182,11 @@ LevelIntro::draw(Compositor& compositor) | |||
| Statistics::time_to_string(m_level.m_target_time), targetTimeBeaten); | |||
| } | |||
| } | |||
| py+=32; | |||
There was a problem hiding this comment.
spaces around operators and in between arguments
Changes from original repo
Semphriss
requested changes
Apr 22, 2021
data/locale/pl.po
Outdated
Comment on lines
1186
to
1188
| #: src/supertux/levelintro.cpp:187 | ||
| msgid "Level Note" | ||
| msgstr "Informacja o poziome" |
There was a problem hiding this comment.
Please don't add translations manually, use Transifex instead
src/audio/sound_manager.cpp
Outdated
Comment on lines
350
to
353
| if (m_music_source | ||
| && m_music_source->get_fade_state() != StreamSoundSource::FadingPause) | ||
| m_music_source->set_fading(StreamSoundSource::FadingPause, fadetime); | ||
| && m_music_source->get_fade_state() != StreamSoundSource::FadingPause){ | ||
| m_music_source->set_fading(StreamSoundSource::FadingPause, fadetime); | ||
| } |
There was a problem hiding this comment.
Tab alignment with the closing bracket
src/audio/sound_manager.cpp
Outdated
Comment on lines
404
to
407
| if (m_music_source | ||
| && m_music_source->get_fade_state() != StreamSoundSource::FadingResume) | ||
| m_music_source->set_fading(StreamSoundSource::FadingResume, fadetime); | ||
| && m_music_source->get_fade_state() != StreamSoundSource::FadingResume){ | ||
| m_music_source->set_fading(StreamSoundSource::FadingResume, fadetime); | ||
| } |
There was a problem hiding this comment.
Same as above
Why have these lines changes? They don't seem related to the PR...
src/supertux/level.cpp
Outdated
Comment on lines
129
to
131
| if(!m_note.empty()){ | ||
| writer.write("note",m_note,false); | ||
| } |
There was a problem hiding this comment.
Spacing (before open brackets and after commas)
src/supertux/levelintro.cpp
Outdated
Comment on lines
186
to
188
| if(!m_level.m_note.empty()){ | ||
| context.color().draw_center_text(Resources::normal_font, _("Level Note")+": "+m_level.m_note, Vector(0,py), LAYER_FOREGROUND1); | ||
| } |
There was a problem hiding this comment.
Spacing (same as above, and around operators)
| @@ -34,6 +34,7 @@ EditorLevelMenu::EditorLevelMenu() : | |||
| add_textfield(_("Author"), &(level->m_author)); | |||
| add_textfield(_("Contact"), &(level->m_contact)); | |||
| add_textfield(_("License"), &(level->m_license)); | |||
| add_textfield(_("Level Note"),(&level->m_note)); | |||
There was a problem hiding this comment.
Space after comma
Also, ampersand outside parentheses
src/supertux/menu/game_menu.cpp
Outdated
|
|
||
Added bonus lightboxes that are on by default (#1683)
Semphriss
approved these changes
May 23, 2021
tobbi
reviewed
May 23, 2021
src/supertux/levelintro.cpp
Outdated
| @@ -182,6 +182,11 @@ LevelIntro::draw(Compositor& compositor) | |||
| Statistics::time_to_string(m_level.m_target_time), targetTimeBeaten); | |||
| } | |||
| } | |||
| py += 32; | |||
| if (!m_level.m_note.empty()) { | |||
| context.color().draw_center_text(Resources::normal_font, _("Level Note") + std::string(": ") + m_level.m_note, Vector(0, py), LAYER_FOREGROUND1); | |||
There was a problem hiding this comment.
Don't do this. Put Level Note: %s (%s being a placeholder) in one string. Otherwise rtl languages will hate us forever.
I don't know at the top of my head how placeholders work, but you can find other examples in our code.
tobbi
approved these changes
Jun 7, 2021
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.
No description provided.