fix that pesky Starpower/Overdrive bug for good, the last commit allo…

…wed me to do so.
stump · Jun 12, 2011 · 3d9ff14 · 3d9ff14
1 parent 7548184
commit 3d9ff14
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/Instrument.py b/src/Instrument.py
@@ -1250,7 +1250,7 @@ def renderNotes(self, visibility, song, pos):
       if event.finalStar and self.spEnabled:
         spNote = True
         if event.played or event.hopod:
-          if event.flameCount == 0:
+          if event.flameCount < 1 and not self.starPowerGained:
             if self.starPower < 50 and self.isDrum:   #not enough starpower to activate yet, kill existing drumfills
               for dfEvent in self.drumFillEvents:
                 dfEvent.happened = True
@@ -1267,8 +1267,6 @@ def renderNotes(self, visibility, song, pos):
 
               if self.starPower < 100:
                 self.starPower += 25
-                if self.hitFlamesPresent == False:
-                  event.flameCount = 1
               if self.starPower > 100:
                 self.starPower = 100
             self.overdriveFlashCount = 0  #MFH - this triggers the oFlash strings & timer
@@ -1431,16 +1429,14 @@ def renderOpenNotes(self, visibility, song, pos):
       if event.finalStar and self.spEnabled:
         spNote = True
         if event.played or event.hopod:
-          if event.flameCount == 0:
+          if event.flameCount < 1 and not self.starPowerGained:
 
             if self.starPower < 50:   #not enough starpower to activate yet, kill existing drumfills
               for dfEvent in self.drumFillEvents:
                 dfEvent.happened = True
 
             if self.starPower < 100:
               self.starPower += 25
-              if self.hitFlamesPresent == False:
-                event.flameCount = 1
             if self.starPower > 100:
               self.starPower = 100
             self.overdriveFlashCount = 0  #MFH - this triggers the oFlash strings & timer