Skip to content

Commit

Permalink
make spNote self.spNote
Browse files Browse the repository at this point in the history
  • Loading branch information
mdsitton committed Jun 17, 2011
1 parent 60245c3 commit 1601bd5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/Instrument.py
Expand Up @@ -185,6 +185,7 @@ def __init__(self, engine, playerObj, player = 0):
self.spEnabled = True
self.starPower = 0
self.starPowerGained = False
self.spNote = False

self.starpowerMode = self.engine.config.get("game", "starpower_mode") #MFH
self.killPoints = False
Expand Down Expand Up @@ -1235,7 +1236,6 @@ def renderNotes(self, visibility, song, pos):
length = 0

tailOnly = False
spNote = False

#myfingershurt: user setting for starpower refill / replenish notes
if self.starPowerActive:
Expand All @@ -1253,9 +1253,9 @@ def renderNotes(self, visibility, song, pos):
self.starNotesInView = True

if event.star and self.spEnabled:
spNote = True
self.spNote = True
if event.finalStar and self.spEnabled:
spNote = True
self.spNote = True
if event.played or event.hopod:
if event.flameCount < 1 and not self.starPowerGained:
if self.starPower < 50 and self.isDrum: #not enough starpower to activate yet, kill existing drumfills
Expand Down Expand Up @@ -1303,7 +1303,7 @@ def renderNotes(self, visibility, song, pos):

glPushMatrix()
glTranslatef(x, 0, z)
self.renderNote(length, sustain = sustain, color = color, tailOnly = tailOnly, isTappable = isTappable, fret = event.number, spNote = spNote, isOpen = isOpen)
self.renderNote(length, sustain = sustain, color = color, tailOnly = tailOnly, isTappable = isTappable, fret = event.number, spNote = self.spNote, isOpen = isOpen)
glPopMatrix()
else:
if z + length < -1.0:
Expand All @@ -1326,7 +1326,7 @@ def renderNotes(self, visibility, song, pos):
else:
renderNote = 0
if renderNote == 0:
self.renderNote(length, sustain = sustain, color = color, tailOnly = tailOnly, isTappable = isTappable, fret = event.number, spNote = spNote)
self.renderNote(length, sustain = sustain, color = color, tailOnly = tailOnly, isTappable = isTappable, fret = event.number, spNote = self.spNote)
glPopMatrix()

#myfingershurt: end FOR loop / note rendering loop
Expand Down

0 comments on commit 1601bd5

Please sign in to comment.