# HG changeset patch
# User Jeremy Thurgood <firxen@gmail.com>
# Date 1378415822 -7200
# Node ID 7b121ed73b956a93d3d68c44c5841809fd4b28bf
# Parent  c0e563fdfd90ab6e72fadd4040c04a8367c0dd8d
--no-music flag.

diff -r c0e563fdfd90 -r 7b121ed73b95 nagslang/constants.py
--- a/nagslang/constants.py	Thu Sep 05 22:41:27 2013 +0200
+++ b/nagslang/constants.py	Thu Sep 05 23:17:02 2013 +0200
@@ -6,6 +6,7 @@
 DEFAULTS = dict(
     debug=False,
     sound=True,
+    music=True,
 )
 
 # Sound constants
diff -r c0e563fdfd90 -r 7b121ed73b95 nagslang/options.py
--- a/nagslang/options.py	Thu Sep 05 22:41:27 2013 +0200
+++ b/nagslang/options.py	Thu Sep 05 23:17:02 2013 +0200
@@ -27,7 +27,13 @@
     parser = optparse.OptionParser()
     parser.add_option('--no-sound',
                       dest='sound', action='store_false', default=True,
-                      help='Disable sound')
+                      help='Disable all sound, including music')
+
+    parser = optparse.OptionParser()
+    parser.add_option('--no-music',
+                      dest='music', action='store_false', default=True,
+                      help='Disable music (but not sound)')
+
     if options.debug:
         parser.add_option('--area', help='Initial area')
 
diff -r c0e563fdfd90 -r 7b121ed73b95 nagslang/sound.py
--- a/nagslang/sound.py	Thu Sep 05 22:41:27 2013 +0200
+++ b/nagslang/sound.py	Thu Sep 05 23:17:02 2013 +0200
@@ -49,6 +49,8 @@
             sound.play()
 
     def play_music(self, name, volume=1.0):
+        if not options.music:
+            return
         track_name = resources.get_resource_path("music", name)
         mixer.music.load(track_name)
         mixer.music.set_volume(volume)