Mercurial > pyntnclick
changeset 763:afe7b1cb16c0 pyntnclick
Interacts should get their images through the game's resource module
| author | Stefano Rivera <stefano@rivera.za.net> |
|---|---|
| date | Sat, 26 Jan 2013 13:24:01 +0200 |
| parents | 683ff96d413e |
| children | a8510f4e2ea1 43b49f1de828 |
| files | pyntnclick/scenewidgets.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pyntnclick/scenewidgets.py Sat Jan 26 13:16:46 2013 +0200 +++ b/pyntnclick/scenewidgets.py Sat Jan 26 13:24:01 2013 +0200 @@ -9,10 +9,6 @@ from pyntnclick.state import Thing from pyntnclick.widgets.text import LabelWidget -# XXX: Needs a way to get at resource: -from pyntnclick.resources import Resources -get_image = Resources("data").get_image - class Interact(object): @@ -77,10 +73,13 @@ self._image_name = image_name def set_thing(self, thing): - self.image = get_image(thing.folder, self._image_name) + self.image = thing.resource.get_image(thing.folder, self._image_name) self.rect = Rect(self._pos, self.image.get_size()) self.interact_rect = self.rect + def __repr__(self): + return '<InteractImage: %s>' % self._image_name + class InteractImageRect(InteractImage): def __init__(self, x, y, image_name, r_x, r_y, r_w, r_h): @@ -108,7 +107,8 @@ self._delay = delay def set_thing(self, thing): - self._anim_seq = [get_image(thing.folder, x) for x in self._names] + self._anim_seq = [thing.resource.get_image(thing.folder, x) + for x in self._names] self.image = self._anim_seq[0] self.rect = Rect(self._pos, self.image.get_size()) for image in self._anim_seq: