Some minor fixes

stump · Jun 4, 2011 · 50aa578 · 50aa578
1 parent 9ccd514
commit 50aa578
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Instrument.py b/src/Instrument.py
@@ -355,8 +355,8 @@ def loadFlames(self):
 
     self.HCount         = 0
     self.HCount2        = 0
-    self.HFrameLimit	= self.engine.theme.HitFlameFrameLimit
-    self.HFrameLimit2	= self.engine.theme.HoldFlameFrameLimit
+    self.HFrameLimit	= self.engine.theme.HoldFlameFrameLimit
+    self.HFrameLimit2	= self.engine.theme.HitFlameFrameLimit
     self.Hitanim        = True
     self.Hitanim2       = True
     self.HCountAni      = False
@@ -479,7 +479,7 @@ def loadFrets(self):
     if self.twoDkeys == True: #death_au
       if self.gameMode2p == 6:
         engine.loadImgDrawing(self, "battleFrets", get("battle_frets.png"))
-
+      engine.loadImgDrawing(self, "fretButtons", get("fretbuttons.png"))
     else:
       defaultKey = False
 
@@ -886,7 +886,7 @@ def renderFlames(self, visibility, song, pos, controls):
             HIndex = (self.HCount * self.HFrameLimit - (self.HCount * self.HFrameLimit) % self.Animspeed) / self.Animspeed
             if HIndex >= self.HFrameLimit:
               HIndex = 0
-            texX = (HIndex*(1.0/self.HFrameLimit), HIndex*(1.0/self.HFrameLimit+1.0/self.HFrameLimit))
+            texX = (HIndex*(1.0/self.HFrameLimit), HIndex*(1.0/self.HFrameLimit)+(1.0/self.HFrameLimit))
             if self.disableFlameSFX != True:
               self.engine.draw3Dtex(self.hitglowAnim, coord = (x, y + .225, 0), rot = (90, 1, 0, 0), scale = (2.4, 1, 3.3),
                                     vertex = (-flameSize * ff,-flameSize * ff,flameSize * ff,flameSize * ff),