0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert change in 2006-04-29T03:18:38Z!rusty@rustcorp.com.au

Browse source 
where scenario music set *after* story (scottk complained).  If you
want to set it after story, use prestart event.
This commit is contained in:
Rusty Russell 2006-05-08 13:20:30 +00:00
parent ca6ce641db
commit 3fae770db4
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/playsingle_controller.cpp
View file

@ -120,6 +120,14 @@ LEVEL_RESULT playsingle_controller::play_scenario(const std::vector<config*>& st
{
LOG_NG << "in playsingle_controller::play_scenario()...\n";
// Start music.
const config::child_list& m = level_.get_children("music");
config::const_child_iterator i;
for (i = m.begin(); i != m.end(); i++) {
sound::play_music_config(**i);
}
sound::commit_music_changes();
if(!skip_replay) {
for(std::vector<config*>::const_iterator story_i = story.begin(); story_i != story.end(); ++story_i) {
@ -147,14 +155,6 @@ LEVEL_RESULT playsingle_controller::play_scenario(const std::vector<config*>& st
replaying_ = (recorder.at_end() == false);
// Start music (intro music might be playing already).
const config::child_list& m = level_.get_children("music");
config::const_child_iterator i;
for (i = m.begin(); i != m.end(); i++) {
sound::play_music_config(**i);
}
sound::commit_music_changes();
LOG_NG << "starting main loop\n" << (SDL_GetTicks() - ticks_) << "\n";
// Initialize countdown clock.