From: David Sharpe <decoydavid@gmail.com>
Date: Sun, 11 May 2014 16:32:11 +0000 (+0200)
Subject: merge
X-Git-Tag: 0.1~413
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=9299925383d4746e7f9c4e948e083a1bff1e339a;hp=-c;p=naja.git

merge
---

9299925383d4746e7f9c4e948e083a1bff1e339a
diff --combined naja/engine.py
index 3565f4b,a8e0146..84bf9d0
--- a/naja/engine.py
+++ b/naja/engine.py
@@@ -13,6 -13,7 +13,7 @@@ class Engine(object)
      def run(self):
          clock = pygame.time.Clock()
          while True:
+             self._surface.fill((0, 0, 0))
              for ev in pygame.event.get():
                  if ev.type == pgl.QUIT or QuitGameEvent.matches(ev):
                      self.quit_game()
@@@ -20,7 -21,6 +21,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()
diff --combined naja/scenes/menu.py
index a72beff,a13abcf..b17f611
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@@ -7,22 -7,16 +7,23 @@@ import pygame.locals as pg
  from naja.scenes.scene import Scene
  from naja.widgets.text import TextWidget
  from naja.events import QuitGameEvent
 -
 +from naja.scenes.credits import CreditsScene
 +from naja.events import SceneChangeEvent
  
  class MenuScene(Scene):
  
      def __init__(self):
          super(MenuScene, self).__init__()
+         self.widgets.append(TextWidget((10, 10), 'Haai', fontsize=32,
 +        self.widgets.append(TextWidget((10, 10), 'Naja',
                              colour=(255, 255, 255)))
 +        self.credits_menu = CreditsScene()
 +        self.credits_menu.set_base_menu(self)
  
      def handle_event(self, ev):
          if ev.type == pgl.KEYUP and ev.key in (pgl.K_q, pgl.K_ESCAPE):
              QuitGameEvent.post()
              return
 +        if ev.type == pgl.KEYUP and ev.key is pgl.K_RETURN:
 +            SceneChangeEvent.post(self.credits_menu)
 +            return