Mercurial > nagslang
changeset 292:7b121ed73b95
--no-music flag.
| author | Jeremy Thurgood <firxen@gmail.com> |
|---|---|
| date | Thu, 05 Sep 2013 23:17:02 +0200 |
| parents | c0e563fdfd90 |
| children | 47226c661ae2 |
| files | nagslang/constants.py nagslang/options.py nagslang/sound.py |
| diffstat | 3 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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')
--- 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)