Merge: serialization: safe formal types, fix warnings in generated code and more

[nit.git] / contrib / asteronits / src / asteronits.nit

diff --git a/contrib/asteronits/src/asteronits.nit b/contrib/asteronits/src/asteronits.nit
index e5ffedf..d7621de 100644 (file)
--- a/contrib/asteronits/src/asteronits.nit
+++ b/contrib/asteronits/src/asteronits.nit
@@ -19,14 +19,13 @@ module asteronits is
        app_version(1, 0, git_revision)
 
        android_manifest_activity """android:screenOrientation="sensorLandscape""""
-       android_api_target 15
+       android_api_target 10
 end
 
 import gamnit::flat
 
 import game_logic
 import spritesheet
-import app::audio
 
 redef class Spritesheet
        # Largest meteors, organized by color
@@ -61,7 +60,7 @@ redef class App
        var world = new World(12, 2, display.aspect_ratio) is lazy
 
        # Sound effects
-       private var fx_fire = new Sound("sounds/fire.mp3")
+       private var fx_fire = new Sound("sounds/fire.ogg")
        private var fx_explosion_ship = new Sound("sounds/explosion_ship.wav")
        private var fx_explosion_asteroids = new Sound("sounds/explosion_asteroids.wav")
 
@@ -90,6 +89,8 @@ redef class App
 
        redef fun accept_event(event)
        do
+               if super then return true
+
                if event isa QuitEvent then
                        exit 0
                else if event isa KeyEvent then
@@ -230,15 +231,15 @@ redef class KeyEvent
        # How does this event affect the ship thrust?
        fun thrust: Float
        do
-               if is_arrow_up or name == "w" then return 1.0
+               if name == "up" or name == "w" then return 1.0
                return 0.0
        end
 
        # How does this event affect the ship thrust?
        fun rotation: Float
        do
-               if is_arrow_right or name == "d" then return -1.0
-               if is_arrow_left or name == "a" then return 1.0
+               if name == "right" or name == "d" then return -1.0
+               if name == "left" or name == "a" then return 1.0
                return 0.0
        end
 end