mail[Wesnoth-commits] r33234 - in /trunk: changelog src/playsingle_controller.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by shadowm2006 on March 01, 2009 - 16:28:
Author: shadowmaster
Date: Sun Mar  1 16:28:18 2009
New Revision: 33234

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33234&view=rev
Log:
Fix a regression from r31664 by cib which trampled part of r28335 and
made endlevel music be played even when skipping linger mode or using
result=continue/continue_no_save. Thanks Elvish_Pillager for mentioning
this on IRC.

Modified:
    trunk/changelog
    trunk/src/playsingle_controller.cpp

Modified: trunk/changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=33234&r1=33233&r2=33234&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Sun Mar  1 16:28:18 2009
@@ -6,6 +6,9 @@
  * Language and i18n:
    * updated translations: Chinese (Simplified), Czech, French, German, 
Italian,
      Polish, Portuguese (Brazil), Spanish, Turkish
+ * Music and sound effects:
+   * Fix a regression which caused the endlevel music to be played even when
+     skipping linger mode (e.g. result=continue or continue_no_save).
  * Miscellaneous and bug fixes:
    * Removed last binaryWML references by making the save_index gzip
      compressed. (We can still receive binaryWML via the network.)

Modified: trunk/src/playsingle_controller.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=33234&r1=33233&r2=33234&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Sun Mar  1 16:28:18 2009
@@ -398,7 +398,7 @@
                        // a victory, so let them use [music] tags
                        // instead should they want special music.
                        //
-                       if(end_level.result == VICTORY && !obs) {
+                       if(end_level.result == VICTORY && (!obs) && 
(end_level.linger_mode)) {
                                const std::string& victory_music = 
select_victory_music();
                                if(victory_music.empty() != true)
                                        sound::play_music_once(victory_music);




Related Messages


Powered by MHonArc, Updated Sun Mar 01 16:40:05 2009