typuspocus

Merge lp:~alecu/typuspocus/fix-1185675 into lp:typuspocus

  1. fix-1185675
  2. Merge into trunk
Proposed by Alejandro J. Cura
Status: Merged
Merged at revision: 393
Proposed branch: lp:~alecu/typuspocus/fix-1185675
Merge into: lp:typuspocus
Diff against target: 12 lines (+1/-1)
1 file modified
typuspocus/sounds.py (+1/-1)
To merge this branch: bzr merge lp:~alecu/typuspocus/fix-1185675
Reviewer Review Type Date Requested Status
Facundo Batista Pending
Review via email: mp+166437@code.launchpad.net

Commit message

Use the proper path for in-game music

Description of the change

Use the proper path for in-game music

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'typuspocus/sounds.py'
2--- typuspocus/sounds.py 2010-04-02 22:42:06 +0000
3+++ typuspocus/sounds.py 2013-05-30 05:01:27 +0000
4@@ -39,7 +39,7 @@
5 ['mmbas1', 'mmbas2', 'mmin1', 'mmin2', 'mmin3', 'mmin4', 'mmin5', 'mmin6', 'mmin7', 'mmin8'],
6 ['mmdnza1', 'mmdnza2', 'mmdnza3', 'mmdnza4', 'mmdnzb1', 'mmdnzb2', 'mmdnzb3', 'mmdnzb4', 'mmdnzb5', 'mmdnzb6', 'mmdnzb7'],
7 ]
8- self.music_parts = [[pygame.mixer.Sound('music/%s.ogg' % fname) for fname in group] for group in self.music_groups]
9+ self.music_parts = [[pygame.mixer.Sound(os.path.join(MUSIC_DIR, '%s.ogg' % fname)) for fname in group] for group in self.music_groups]
10 self.music_part_count = len(self.music_parts)
11
12 self.musicfiles = [f for f in os.listdir(MUSIC_DIR) if f.startswith('mm') and f.endswith('ogg')]

Subscribers

People subscribed via source and target branches