comparison pyntnclick/state.py @ 612:cfc16ded7b34 pyntnclick

Fix scene/screen confusion
author Neil Muller <neil@dip.sun.ac.za>
date Sat, 11 Feb 2012 21:12:45 +0200
parents a25cd1c6335a
children 85153f422522
comparison
equal deleted inserted replaced
611:4fcc389f4d40 612:cfc16ded7b34
103 103
104 def add_item(self, item): 104 def add_item(self, item):
105 item.set_game(self) 105 item.set_game(self)
106 self.items[item.name] = item 106 self.items[item.name] = item
107 107
108 def load_scenes(self, modname, engine): 108 def load_scenes(self, modname):
109 mod = __import__("gamelib.scenes.%s" % (modname,), fromlist=[modname]) 109 mod = __import__("gamelib.scenes.%s" % (modname,), fromlist=[modname])
110 for scene_cls in mod.SCENES: 110 for scene_cls in mod.SCENES:
111 scene = scene_cls(self) 111 scene = scene_cls(self)
112 self.add_scene(scene) 112 self.add_scene(scene)
113 engine.add_screen(scene.name, scene)
114 if hasattr(mod, 'DETAIL_VIEWS'): 113 if hasattr(mod, 'DETAIL_VIEWS'):
115 for scene_cls in mod.DETAIL_VIEWS: 114 for scene_cls in mod.DETAIL_VIEWS:
116 scene = scene_cls(self) 115 scene = scene_cls(self)
117 self.add_detail_view(scene) 116 self.add_detail_view(scene)
118 engine.add_screen(scene.name, scene)
119 117
120 def set_current_scene(self, name): 118 def set_current_scene(self, name):
121 old_scene = self.current_scene 119 old_scene = self.current_scene
122 self.current_scene = self.scenes[name] 120 self.current_scene = self.scenes[name]
123 self.current_thing = None 121 self.current_thing = None