Mercurial > pyntnclick

changeset 586:cf65e91b30b1 pyntnclick

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use load_image where possible
author Stefano Rivera <stefano@rivera.za.net>
date Sat, 11 Feb 2012 16:56:01 +0200
parents ec13a5a0b213
children f20d211d2c91
files pyntnclick/endscreen.py pyntnclick/menu.py pyntnclick/state.py
diffstat 3 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/pyntnclick/endscreen.py	Sat Feb 11 16:51:39 2012 +0200
+++ b/pyntnclick/endscreen.py	Sat Feb 11 16:56:01 2012 +0200
@@ -3,7 +3,6 @@
 # Victory screen for the game
 
 from albow.screen import Screen
-from albow.resource import get_image
 
 from pyntnclick.widgets import BoomImageButton
 
@@ -16,7 +15,8 @@
 class EndScreen(Screen):
     def __init__(self, shell, game_description):
         Screen.__init__(self, shell)
-        self.background = get_image('won', 'won.png')
+        self.background = game_description.resource.load_image(
+                ('won', 'won.png'))
         self._menu_button = EndImageButton('menu.png', 26, 500,
                 action=self.main_menu)
         self._quit_button = EndImageButton('quit.png', 250, 500,
--- a/pyntnclick/menu.py	Sat Feb 11 16:51:39 2012 +0200
+++ b/pyntnclick/menu.py	Sat Feb 11 16:56:01 2012 +0200
@@ -3,7 +3,6 @@
 # Main menu for the game
 
 from albow.screen import Screen
-from albow.resource import get_image
 
 from pyntnclick.widgets import BoomImageButton
 
@@ -16,7 +15,8 @@
 class MenuScreen(Screen):
     def __init__(self, shell, game_description):
         Screen.__init__(self, shell)
-        self._background = get_image('splash', 'splash.png')
+        self._background = game_description.resource.load_image(
+                ('splash', 'splash.png'))
         self._start_button = SplashButton('play.png', 16, 523, self.start)
         self._resume_button = SplashButton('resume.png', 256, 523, self.resume,
                                            enable=self.check_running)
--- a/pyntnclick/state.py	Sat Feb 11 16:51:39 2012 +0200
+++ b/pyntnclick/state.py	Sat Feb 11 16:56:01 2012 +0200
@@ -2,7 +2,6 @@
 
 import copy
 
-from albow.resource import get_image
 from albow.utils import frame_rect
 from widgets import BoomLabel
 from pygame.rect import Rect
@@ -281,7 +280,8 @@
 
     def _cache_background(self):
         if self.BACKGROUND and not self._background:
-            self._background = get_image(self.FOLDER, self.BACKGROUND)
+            self._background = self.state.gd.resource.load_image(
+                    (self.FOLDER, self.BACKGROUND))
 
     def draw_background(self, surface):
         self._cache_background()
@@ -504,7 +504,8 @@
 
     def _cache_inventory_image(self):
         if not self.inventory_image:
-            self.inventory_image = get_image('items', self.INVENTORY_IMAGE)
+            self.inventory_image = self.state.resource.load_image(
+                    'items', self.INVENTORY_IMAGE)
 
     def set_state(self, state):
         assert self.state is None