examples/moles: clean up management of `App::screen`

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/examples/mnit_moles/src/moles.nit b/examples/mnit_moles/src/moles.nit
index bfa03e7..ecaf067 100644 (file)
--- a/examples/mnit_moles/src/moles.nit
+++ b/examples/mnit_moles/src/moles.nit
@@ -210,7 +210,8 @@ end
 
 redef class App
 
-       var screen: nullable Screen = null
+       # Main play screen
+       var screen = new Screen
 
        # Image set generate by inkscape_tools
        var assets = new DrawingImages
@@ -229,33 +230,23 @@ redef class App
                super
 
                maximum_fps = 50
-               init_screen_and_game
        end
 
-       fun init_screen_and_game do screen = new Screen
-
        redef fun frame_core(display)
        do
-               var screen = self.screen
-               if screen != null then
-                       screen.game.do_turn
-                       screen.do_frame(display)
-               end
+               screen.game.do_turn
+               screen.do_frame(display)
        end
 
        redef fun input(ie)
        do
-               var screen = screen
                if ie isa QuitEvent or
                        (ie isa KeyEvent and ie.to_c == 'q') then
                        quit = true
                        return true
-               else if screen != null then
-                       return screen.input(ie)
-               else
-                       print "unknown input: {ie}"
-                       return false
                end
+
+               return screen.input(ie)
        end
 end
 

diff --git a/examples/mnit_moles/src/moles_android.nit b/examples/mnit_moles/src/moles_android.nit
index 677cb5b..d89500f 100644 (file)
--- a/examples/mnit_moles/src/moles_android.nit
+++ b/examples/mnit_moles/src/moles_android.nit
@@ -27,7 +27,7 @@ redef class Game
 end
 
 redef class App
-       redef fun init_screen_and_game
+       redef fun on_start
        do
                # We use as a reference the Moto X
                var tw = 720