[wesnoth-commits] [wesnoth/wesnoth] 91d35e: Revert "Fix #2602: music doesn't change immediatel...

[GitHub]

  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 91d35e3d8666478c34d31f734c63c04a17d9584c
      https://github.com/wesnoth/wesnoth/commit/91d35e3d8666478c34d31f734c63c04a17d9584c
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M src/savegame.cpp
    M src/sound.cpp
    M src/sound.hpp

  Log Message:
  -----------
  Revert "Fix #2602: music doesn't change immediately on loading a save"

This reverts commit 1fb9378df14eacd84b416817c283685552577400.

The commit caused the music to change even when the player loaded a save
from the same scenario. A different fix is needed.


  Commit: 544b68d7a7ccafbde150356de332bbadd6669580
      https://github.com/wesnoth/wesnoth/commit/544b68d7a7ccafbde150356de332bbadd6669580
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M src/playsingle_controller.cpp
    M src/scripting/lua_audio.cpp
    M src/sound.cpp
    M src/sound.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Fix #2602: music doesn't change immediately on loading a save

This time I added an option to disable the feature to allow the currently
playing track to finish when changing the playlist. This allows more
fine-grained control of distinct use cases.

In wesnoth.cpp:do_gameloop(), I reversed the order of the title screen
music and default music because otherwise adding the default music would
enable play_once for the title screen music and prevent instant music
change when the player loads a save. I play title screen music with
immediate=yes, so it's still played first.


Compare: https://github.com/wesnoth/wesnoth/compare/65643adab840...544b68d7a7cc
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.