Mercurial > boomslang
diff gamelib/scenes/manual.py @ 852:f95830b58336
Merge pyntnclick
author | Stefano Rivera <stefano@rivera.za.net> |
---|---|
date | Sat, 21 Jun 2014 22:04:35 +0200 |
parents | ac9ffba3e97d |
children |
line wrap: on
line diff
--- a/gamelib/scenes/manual.py Sat Jun 21 17:38:39 2014 +0000 +++ b/gamelib/scenes/manual.py Sat Jun 21 22:04:35 2014 +0200 @@ -1,10 +1,7 @@ """The inside of the maintenance manual.""" -from albow.music import change_playlist - -from gamelib.state import Scene, Thing -from gamelib.sound import get_current_playlist -from gamelib.scenewidgets import InteractNoImage, InteractImage +from pyntnclick.state import Scene, Thing +from pyntnclick.scenewidgets import InteractNoImage, InteractImage # classes related the computer detail @@ -14,7 +11,7 @@ "Displays manual pages" def get_page_thing(self): - return self.state.current_detail.things['manual.page'] + return self.scene.things['manual.page'] def get_page(self): return self.get_page_thing().get_data('page') @@ -22,9 +19,12 @@ def set_page(self, page): self.get_page_thing().set_page(page) + def select_interact(self): + return self.get_data('display') + def set_display(self, display): self.set_data('display', display) - self.set_interact(display) + self.set_interact() def is_interactive(self, tool=None): return self.get_data('display') == 'on' @@ -88,9 +88,12 @@ def is_interactive(self, tool=None): return False + def select_interact(self): + return self.get_data('page') + def set_page(self, page): self.set_data('page', page) - self.set_interact(page) + self.set_interact() self.scene.things['manual.page_prior'].set_display('on') self.scene.things['manual.page_next'].set_display('on') if page == 0: @@ -106,20 +109,18 @@ BACKGROUND = 'manual_detail.png' - def __init__(self, state): - super(ManualDetail, self).__init__(state) - + def setup(self): self.add_thing(ManualPage()) self.add_thing(PagePrior()) self.add_thing(PageNext()) self._scene_playlist = None def enter(self): - self._scene_playlist = get_current_playlist() - change_playlist(None) + self._scene_playlist = self.sound.get_current_playlist() + self.sound.change_playlist(None) def leave(self): - change_playlist(self._scene_playlist) + self.sound.change_playlist(self._scene_playlist) SCENES = []