Merge branch 'master' of git://github.com/stump/fofix

stump · Jun 25, 2011 · 90ba19d · 90ba19d
2 parents 3e8d8f7 + 4c3fd9f
commit 90ba19d
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/Instrument.py b/src/Instrument.py
@@ -860,11 +860,12 @@ def renderFlames(self, song, pos, controls):
       if (event.played or event.hopod) and event.flameCount < flameLimit:
         if not self.disableFlameSFX:
           if not flameColor == self.spColor:
-            if self.isDrum: 
+            if self.isDrum:
+              if event.number == 4:
+                continue
+
               if event.number == 0:
                 flameColor = self.flameColors[4]
-              elif event.number == 4:
-                flameColor = self.flameColors[0]
               else:
                 flameColor = self.flameColors[event.number]
             else:
@@ -873,9 +874,6 @@ def renderFlames(self, song, pos, controls):
           ms = math.sin(self.time) * .25 + 1
 
           if self.isDrum:
-            if event.number == 0:
-              x  = (self.strings / 2 - 2) * w
-            else:
               x  = (self.strings / 2 +.5 - event.number) * w
           else:
             x  = (self.strings / 2 - event.number) * w