Mercurial > pyntnclick
changeset 595:59f1ee3f5632 pyntnclick
Remove albow.resources in a few more places.
| author | Jeremy Thurgood <firxen@gmail.com> |
|---|---|
| date | Sat, 11 Feb 2012 18:18:59 +0200 |
| parents | a9e9a7fbdbcf |
| children | 5496dcd16a84 |
| files | gamelib/scenes/bridge.py gamelib/scenes/cryo.py gamelib/scenes/engine.py pyntnclick/state.py |
| diffstat | 4 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/gamelib/scenes/bridge.py Sat Feb 11 18:04:23 2012 +0200 +++ b/gamelib/scenes/bridge.py Sat Feb 11 18:18:59 2012 +0200 @@ -5,7 +5,6 @@ from pygame.colordict import THECOLORS from pygame.color import Color from pygame.rect import Rect -from albow.resource import get_image from pyntnclick.cursor import CursorSprite from pyntnclick.state import Scene, Item, Thing, Result @@ -577,20 +576,20 @@ #self.add_thing(CompUpButton()) #self.add_thing(CompDownButton()) self._scene_playlist = None - self._alert = 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] = 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] = 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 = [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 18:04:23 2012 +0200 +++ b/gamelib/scenes/cryo.py Sat Feb 11 18:18:59 2012 +0200 @@ -2,8 +2,6 @@ import random -from albow.resource import get_image - from pyntnclick.cursor import CursorSprite from pyntnclick.state import Scene, Item, CloneableItem, Thing, Result from pyntnclick.scenewidgets import (InteractNoImage, InteractRectUnion, @@ -493,7 +491,8 @@ def __init__(self, state): super(CryoCompDetail, self).__init__(state) - self._background_fixed = get_image(self.FOLDER, self.BACKGROUND_FIXED) + self._background_fixed = self.get_image( + self.FOLDER, self.BACKGROUND_FIXED) def draw_background(self, surface): if self.state.scenes['engine'].get_data('engine online'):
--- a/gamelib/scenes/engine.py Sat Feb 11 18:04:23 2012 +0200 +++ b/gamelib/scenes/engine.py Sat Feb 11 18:18:59 2012 +0200 @@ -1,6 +1,5 @@ """Engine room where things need to be repaired.""" -from albow.resource import get_image from pyntnclick.cursor import CursorSprite from pyntnclick.state import Scene, Item, Thing, Result from pyntnclick.scenewidgets import (InteractNoImage, InteractRectUnion, @@ -539,7 +538,7 @@ def setup(self): self._alert_messages = {} for key, name in self.ALERTS.iteritems(): - self._alert_messages[key] = 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
--- a/pyntnclick/state.py Sat Feb 11 18:04:23 2012 +0200 +++ b/pyntnclick/state.py Sat Feb 11 18:18:59 2012 +0200 @@ -373,6 +373,9 @@ self._cache_background() return self._background.get_size() + def get_image(self, *image_name_fragments, **kw): + return self.resource.get_image(image_name_fragments, **kw) + class InteractiveMixin(object): def is_interactive(self, tool=None):