Update Guitar and Drum to use super(). Also fixes variable name

stump · Jun 14, 2011 · 34e62de · 34e62de
1 parent f4a9965
commit 34e62de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Drum.py b/src/Drum.py
@@ -57,7 +57,7 @@
 
 class Drum(Instrument):
   def __init__(self, engine, playerObj, editorMode = False, player = 0):
-    Instrument.__init__(self, engine, playerObj, player)
+    super(Drum, self).__init__(engine, playerObj, player)
 
     self.isDrum = True
     self.isBassGuitar = False

diff --git a/src/Guitar.py b/src/Guitar.py
@@ -36,7 +36,7 @@
 
 class Guitar(Instrument):
   def __init__(self, engine, playerObj, editorMode = False, player = 0, bass = False):
-    Instrument.__init__(self, engine, playerObj, player)
+    super(Guitar, self).__init__(engine, playerObj, player)
 
     self.isDrum = False
     self.isBassGuitar = bass
@@ -144,7 +144,7 @@ def renderFrets(self, visibility, song, controls):
         self.keypos = self.engine.theme.keypos
         self.keyrot = self.engine.theme.keyrot
 
-        if self.keyTex:
+        if self.keytex:
           texture = getattr(self,"keytex"+chr(97+n)).texture
         else:
           texture = None