changeset 623:cab77cf07822 pyntnclick

Undo fix get_image calls
author Stefano Rivera <stefano@rivera.za.net>
date Sat, 11 Feb 2012 21:51:04 +0200
parents 8a4d92c17603
children 1c5ef1e02e30
files gamelib/scenes/bridge.py gamelib/scenes/cryo.py gamelib/scenes/engine.py
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/scenes/bridge.py	Sat Feb 11 21:50:19 2012 +0200
+++ b/gamelib/scenes/bridge.py	Sat Feb 11 21:51:04 2012 +0200
@@ -576,20 +576,20 @@
         #self.add_thing(CompUpButton())
         #self.add_thing(CompDownButton())
         self._scene_playlist = None
-        self._alert = self.get_image((self.FOLDER, self.ALERT_BASE))
+        self._alert = self.get_image(self.FOLDER, self.ALERT_BASE)
         self._alert_messages = {}
         self._nav_messages = {}
         for key, name in self.ALERTS.iteritems():
-            self._alert_messages[key] = self.get_image((self.FOLDER, name))
+            self._alert_messages[key] = self.get_image(self.FOLDER, name)
         for key, name in self.NAVIGATION.iteritems():
-            self._nav_messages[key] = self.get_image((self.FOLDER, name))
+            self._nav_messages[key] = self.get_image(self.FOLDER, name)
         self._nav_lines = []
         self._nav_lines.append(DestNavPageLine(1, (14, 99, 595, 30), False))
         self._nav_lines.append(DestNavPageLine(2, (14, 135, 595, 30), True))
         self._nav_lines.append(DestNavPageLine(3, (14, 167, 595, 30), True))
         self._nav_lines.append(DestNavPageLine(4, (14, 203, 595, 30), True))
         self._nav_lines.append(DestNavPageLine(5, (14, 239, 595, 30), True))
-        self._logs = [self.get_image((self.FOLDER, x)) for x in self.LOGS]
+        self._logs = [self.get_image(self.FOLDER, x) for x in self.LOGS]
 
     def enter(self):
         self._scene_playlist = self.sound.get_current_playlist()
--- a/gamelib/scenes/cryo.py	Sat Feb 11 21:50:19 2012 +0200
+++ b/gamelib/scenes/cryo.py	Sat Feb 11 21:51:04 2012 +0200
@@ -491,7 +491,7 @@
 
     def setup(self):
         self._background_fixed = self.get_image(
-            (self.FOLDER, self.BACKGROUND_FIXED))
+            self.FOLDER, self.BACKGROUND_FIXED)
 
     def draw_background(self, surface):
         if self.game.scenes['engine'].get_data('engine online'):
--- a/gamelib/scenes/engine.py	Sat Feb 11 21:50:19 2012 +0200
+++ b/gamelib/scenes/engine.py	Sat Feb 11 21:51:04 2012 +0200
@@ -538,7 +538,7 @@
     def setup(self):
         self._alert_messages = {}
         for key, name in self.ALERTS.iteritems():
-            self._alert_messages[key] = self.get_image((self.FOLDER, name))
+            self._alert_messages[key] = self.get_image(self.FOLDER, name)
 
     def _draw_alerts(self, surface):
         xpos, ypos = self.ALERT_OFFSET