[WIP] Lluita contra jefes. Càrrega de fase redefinida

data/scenes.lua

@@ -21,6 +21,11 @@ avatar_imp_y = 96
 
 avatar_sf=surf.new(avatar_w, avatar_h)
 
+scene={
+    running = false,
+    stop_music = true
+}
+
 scenes={
     lluita_imp= {
         {x=avatar_abad_x,y=avatar_abad_y,flip=false,audio="abad",text={"Eh!?","...","Tu qui eres?"},die=20},
@@ -162,28 +167,29 @@ scenes={
     },
 }
 
-function start_scene(scene,offset)
+function start_scene(_scene, offset, stop_music)
     --bkg=newsurf(128,96)
     --setdest(bkg)
     --setsource(0)
     --draw.surf(0,0,128,96,0,0)
     --setsource(tiles)
     --setdest(0)
-    scenes.current_scene=scene
+    scenes.current_scene=_scene
     scenes.dnum=1
     scenes.step=0
     scenes.char=1
     scenes.wait=0
     scenes.offset=28
     scenes.die=scenes.current_scene[scenes.dnum].die or 0
-    if scene[1].musica then
+    if _scene[1].musica then
         --print(scene[1].musica)
         music.play(scenes.current_scene[scenes.dnum].musica)
     end
     if offset then scenes.offset=offset end
     -- old_update=game_update
     -- game_update=update_scene
-
+    scene.running = true
+    if not stop_music then scene.stop_music = false end
     flow:executar("scene", true); -- guardar l'estat anterior i executar
 end
 
@@ -362,7 +368,7 @@ function update_scene()
                 scenes.die=scenes.die-1
                 if scenes.die==0 then
                     if scenes.dnum==#scenes.current_scene then
-                        music.stop()
+                        if scene.stop_music then music.stop() end
                         -- if batman.endgame then
                         --     final_init()
                         --     fade.fadeoutin()
@@ -401,7 +407,7 @@ function update_scene()
            controller:check("up")    or controller:check("left") or 
            controller:check("right") or key.press(key.RETURN) then
             if scenes.dnum==#scenes.current_scene then
-                music.stop()
+                if scenes.stop_music then music.stop() end
                 -- if batman.endgame then
                 --     final_init()
                 --     fade.fadeoutin()
@@ -421,7 +427,8 @@ function update_scene()
 end
 
 function end_scene()
+    scene.running = false
     flow:finish()
 end
 
-flow:registrar("scene",{update_scene})
+flow:registrar("scene",{update_scene, end_scene})