Merge branch 'master' of git+ssh://ctpug.org.za/naja
authorDavid Sharpe <decoydavid@gmail.com>
Sun, 11 May 2014 16:59:26 +0000 (18:59 +0200)
committerDavid Sharpe <decoydavid@gmail.com>
Sun, 11 May 2014 16:59:26 +0000 (18:59 +0200)
1  2 
naja/engine.py

diff --combined naja/engine.py
index 84bf9d0efc84e167a637216b9e7572bd1d7b14ee,32c139f8a56f17427b0a426bdb3b1e2fe3ec338d..f17f9c221d17e758cb6b063399b492b30534f2ff
@@@ -6,9 -6,10 +6,10 @@@ from naja.events import SceneChangeEven
  
  
  class Engine(object):
-     def __init__(self, surface, scene):
+     def __init__(self, surface, scene, state):
          self._surface = surface
          self._scene = scene
+         self._state = state
  
      def run(self):
          clock = pygame.time.Clock()
@@@ -21,7 -22,6 +22,7 @@@
                  elif SceneChangeEvent.matches(ev):
                      self.change_scene(ev.scene)
                  else:
 +                    print(ev.type)
                      self._scene.handle_event(ev)
              self._scene.render(self._surface)
              pygame.display.flip()