Removed several duplicate resource loads.

src/Data.py

@@ -163,7 +163,6 @@ def __init__(self, resource, svg):
       self.submenuSelectFound = False
       self.loadImgDrawing(self, "submenuSelect", os.path.join("themes",themename,"menu","selected.png"))
       self.subSelectWFactor = 0
-    self.loadAllImages(self, os.path.join("themes",themename,"common"))
     # load all the data in parallel
     # asciiOnly = not bool(Language.language) or Language.language == "Custom"
     # reversed  = _("__lefttoright__") == "__righttoleft__" and True or False
@@ -401,7 +400,6 @@ def __init__(self, resource, svg):
     resource.load(self, "acceptSounds", self.loadAcceptSounds)    #myfingershurt
     resource.load(self, "cancelSounds", self.loadBackSounds)    #myfingershurt
 
-    resource.load(self, "symcsounds", self.loadScrewUpsounds)
     self.loadSoundEffect(self, "selectSound1", os.path.join("themes",themename,"sounds","select1.ogg"))
 
     if self.fileExists(os.path.join("themes",themename,"sounds","select2.ogg")):

src/Instrument.py

@@ -302,10 +302,10 @@ def __init__(self, engine, playerObj, player = 0):
     # make glow.png optional, theme dependent
     if self.disableFretSFX != False:
       self.glowDrawing = None
-    elif engine.loadImgDrawing(self, "glowDrawing", os.path.join("themes",themename,"glow.png"),  textureSize = (128, 128)):
-      engine.loadImgDrawing(self, "glowDrawing", os.path.join("themes",themename,"glow.png"),  textureSize = (128, 128))
     else:
-      engine.loadImgDrawing(self, "glowDrawing", "glow.png",  textureSize = (128, 128))
+      engine.loadImgDrawing(self, "glowDrawing", os.path.join("themes",themename,"glow.png"),  textureSize = (128, 128))
+      if not self.glowDrawing:
+        engine.loadImgDrawing(self, "glowDrawing", "glow.png")
 
     #MFH - making hitflames optional
     self.hitFlamesPresent = False

src/Lobby.py

@@ -513,11 +513,7 @@ def __init__(self, engine):
                       (_("Delete Character"), _("Quitter.")), \
                       (_("Done"),             _("All finished? Let's do this thing!"))]
     themename = self.engine.data.themeLabel
-
-    if not self.engine.loadImgDrawing(self, "background", os.path.join("themes", themename, "lobby", "creator.png")):
-      self.background = None
-    if not self.engine.loadImgDrawing(self, "backgroundTop", os.path.join("themes", themename, "lobby", "creator_top.png")):
-      self.backgroundTop = None
+    self.engine.data.loadAllImages(self, os.path.join("themes",themename,"lobby","creator"))
 
   def loadPlayer(self, playerNum, player = None):
     self.choices = []
@@ -745,8 +741,8 @@ def render(self, visibility, topMost):
     v = ((1 - visibility) **2)
     w, h = self.fullView
     try:
-      if self.background:
-        self.engine.drawImage(self.background, scale = (1.0,-1.0), coord = (w/2,h/2), stretched = 3)
+      if self.img_creator:
+        self.engine.drawImage(self.img_creator, scale = (1.0, -1.0), coord = (w/2,h/2), stretched = 3)
       helpFont.render(_("Player %d") % (self.playerNum + 1), pos = (.5, .1), scale = self.engine.theme.characterCreateScale, align = 1)
       for i, option in enumerate(self.options):
         r, g, b = self.engine.theme.characterCreateHelpColor
@@ -775,7 +771,7 @@ def render(self, visibility, topMost):
             str = self.values[i-1][self.choices[i]]
           wText, hText = font.getStringSize(str, scale = self.engine.theme.characterCreateScale)
           font.render(str, (self.engine.theme.characterCreateOptionX-wText, self.engine.theme.characterCreateY+self.engine.theme.characterCreateSpace*i), scale = self.engine.theme.characterCreateScale)
-      if self.backgroundTop:
-         self.engine.drawImage(self.backgroundTop, scale = (1.0,-1.0), coord = (w/2,h/2))
+      if self.img_creator_top:
+         self.engine.drawImage(self.img_creator_top, scale = (1.0, -1.0), coord = (w/2,h/2), stretched = 3)
     finally:
       self.engine.view.resetProjection()

src/Neck.py

@@ -219,41 +219,32 @@ def loadImage(name, file):
           engine.loadImgDrawing(self, name, os.path.join(themepath, file))
       else:
         engine.loadImgDrawing(self, name, os.path.join(themepath, file))
-
-
-    #myfingershurt: Bass Groove neck:
-    self.bassGrooveNeck = None
-
+
+    loadImage("sideBars", "side_bars.png")
     loadImage("oSideBars", "overdrive_side_bars.png")
     loadImage("oCenterLines", "overdrive_center_lines.png")
     loadImage("centerLines", "center_lines.png")
-
     loadImage("oNeck", "overdriveneck.png")
-    loadImage("oNeckovr", "overdriveneckovr.png")      
-
     loadImage("oFlash", "overdrive_string_flash.png")
-
-    loadImage("oSideBars", "overdrive_side_bars.png")
-    loadImage("oCenterLines", "overdrive_center_lines.png")
-    loadImage("centerLines", "center_lines.png")
-
-    loadImage("oNeck", "overdriveneck.png")
+    loadImage("bpm_halfbeat", "bpm_halfbeat.png")
+    loadImage("bpm_beat",     "bpm_beat.png")
+    loadImage("bpm_measure",  "bpm_measure.png")
+    loadImage("failNeck", "failneck.png")
+
+    if not self.failNeck:
+      engine.loadImgDrawing(self, "failNeck", os.path.join("failneck.png"))
+
+    if self.ovrneckoverlay:
+      loadImage("oNeckovr", "overdriveneckovr.png")
+
+    #myfingershurt: Bass Groove neck:
+    self.bassGrooveNeck = None
 
     if self.bassGrooveNeckMode > 0:
       if self.bassGrooveNeckMode == 2:  #overlay neck
         engine.loadImgDrawing(self, "bassGrooveNeck", os.path.join(themepath, "bass", "bassgrooveneckovr.png"))
       if self.bassGrooveNeckMode == 1 or not self.bassGrooveNeck:  #replace neck
         engine.loadImgDrawing(self, "bassGrooveNeck", os.path.join(themepath, "bass", "bassgrooveneck.png"))
-
-    loadImage("oFlash", "overdrive_string_flash.png")
-
-    if self.ovrneckoverlay:
-      loadImage("oNeckovr", "overdriveneckovr.png")      
-
-    loadImage("sideBars", "side_bars.png")
-    loadImage("bpm_halfbeat", "bpm_halfbeat.png")
-    loadImage("bpm_beat",     "bpm_beat.png")
-    loadImage("bpm_measure",  "bpm_measure.png")
 
     #myfingershurt: Guitar Solo neck:
     self.soloNeck = None
@@ -263,10 +254,6 @@ def loadImage(name, file):
           loadImage("soloNeck", "soloneck.png")
         elif self.guitarSoloNeckMode == 2:  #overlay neck
           loadImage("soloNeck", "soloneckovr.png")
-
-    loadImage("failNeck", "failneck.png")
-    if not self.failNeck:
-      engine.loadImgDrawing(self, "failNeck", os.path.join("failneck.png"))
 
     self.isFailing = False
     self.canGuitarSolo = self.instrument.canGuitarSolo