Additional information can now be specified for levels.

data/locale/pl.po

@@ -1183,6 +1183,9 @@ msgstr "Wrogowie"
 #: src/supertux/statistics.cpp:271 src/supertux/levelintro.cpp:172
 msgid "Secrets"
 msgstr "Sekrety"
+#: src/supertux/levelintro.cpp:187
+msgid "Level Note"
+msgstr "Informacja o poziome"
 
 #: src/supertux/game_object.hpp:77
 msgid "Unknown object"

src/audio/sound_manager.cpp

@@ -324,13 +324,13 @@ SoundManager::play_music(const std::string& filename, float fadetime)
     if (fadetime > 0)
       newmusic->set_fading(StreamSoundSource::FadingOn, fadetime);
     newmusic->play();
-
     m_music_source = std::move(newmusic);
   } catch(std::exception& e) {
     log_warning << "Couldn't play music file '" << filename << "': " << e.what() << std::endl;
     // When this happens, previous music continued playing, stop it, just in case.
     stop_music(0);
   }
+
 }
 
 void
@@ -344,11 +344,13 @@ SoundManager::pause_music(float fadetime)
 {
   if (m_music_source == nullptr)
     return;
+
 
   if (fadetime > 0) {
     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);
+       }
   } else {
     m_music_source->pause();
   }
@@ -394,13 +396,15 @@ SoundManager::set_sound_volume(int volume)
 void
 SoundManager::resume_music(float fadetime)
 {
+
   if (m_music_source == nullptr)
     return;
 
   if (fadetime > 0) {
     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);
+       }
   } else {
     m_music_source->resume();
   }

src/supertux/level.cpp

@@ -42,6 +42,7 @@ Level::Level(bool worldmap) :
   m_filename(),
   m_sectors(),
   m_stats(),
+  m_note(),
   m_target_time(),
   m_tileset("images/tiles.strf"),
   m_suppress_pause_menu(),
@@ -125,6 +126,9 @@ Level::save(Writer& writer)
   writer.write("version", 3);
   writer.write("name", m_name, true);
   writer.write("author", m_author, false);
+  if(!m_note.empty()){
+    writer.write("note",m_note,false);
+  }
   if (!m_contact.empty()) {
     writer.write("contact", m_contact, false);
   }

src/supertux/level.hpp

@@ -74,6 +74,7 @@ class Level final
   std::string m_contact;
   std::string m_license;
   std::string m_filename;
+  std::string m_note;
   std::vector<std::unique_ptr<Sector> > m_sectors;
   Statistics m_stats;
   float m_target_time;

src/supertux/level_parser.cpp

@@ -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);
 
     auto iter = level.get_iter();
     while (iter.next()) {

src/supertux/levelintro.cpp

@@ -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")+": "+m_level.m_note, Vector(0,py), LAYER_FOREGROUND1);
+  }
+
 }
 
 IntegrationStatus

src/supertux/menu/editor_level_menu.cpp

@@ -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));
   add_file(_("Tileset"), &(level->m_tileset), std::vector<std::string>(1, ".strf"), {});
 
   if (!worldmap) {

src/supertux/menu/game_menu.cpp

@@ -48,7 +48,7 @@ GameMenu::GameMenu() :
   })
 {
   Level& level = GameSession::current()->get_current_level();
-
+  
   add_label(level.m_name);
   add_hl();
   add_entry(MNID_CONTINUE, _("Continue"));