[WIP] Reestructurant codi abans de posar-me en el nivell 2

[NEW] Afegit music_player
[NEW] Música de fons des de l'inici

data/scenes.lua

@@ -191,12 +191,12 @@ scenes={
 }
 
 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)
+    if stop_music then 
+        print("STOP MUSIC") 
+    elseif _scene[1].musica then
+        print("PLAY ".._scene[1].musica) 
+    end
+
     scenes.current_scene=_scene
     scenes.dnum=1
     scenes.step=0
@@ -205,15 +205,15 @@ function start_scene(_scene, offset, stop_music)
     scenes.offset=28
     scenes.die=scenes.current_scene[scenes.dnum].die or 0
     if _scene[1].musica then
-        --print(scene[1].musica)
-        music.play(scenes.current_scene[scenes.dnum].musica)
+        -- print(scene[1].musica)
+        -- music.play(scenes.current_scene[scenes.dnum].musica)
+        music_player: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
-    -- print("SCENE START")
+    print("SCENE START")
     states:executar("scene", true); -- guardar l'estat anterior i executar
 end
 
@@ -242,29 +242,24 @@ end
 function play_music()
     if scenes.current_scene[scenes.dnum].musica then
         -- print("PLAY MUSIC "..scenes.dnum)
-        music.stop()
-        music.play(scenes.current_scene[scenes.dnum].musica)
+        -- music.stop()
+        -- music.play(scenes.current_scene[scenes.dnum].musica)
+        
+        music_player:stop()
+        music_player:play(scenes.current_scene[scenes.dnum].musica)
     end
 end
 
 function draw_abad_with_mood(mood, dx, dy, dw, dh)
     local ox, oy =view.origin()
     view.origin(0,0)
-    -- -- composicio
+    -- composicio
     local curr_sf = surf.target()
     surf.target(avatar_sf)
     surf.cls(16)
     draw.surf(scenes.current_scene[scenes.dnum].x,scenes.current_scene[scenes.dnum].y,avatar_w,avatar_h,0,0,avatar_w,avatar_h)
     abad_add_mood(0,scenes.current_scene[scenes.dnum].x,0,scenes.current_scene[scenes.dnum].y,false,mood)
-    -- if mood=="sorpresa" then
-    --     draw.surf(240,0,11,4,16-scenes.current_scene[scenes.dnum].x,5-scenes.current_scene[scenes.dnum].y,11,4)
-    -- elseif mood=="enfadat" then
-    --     draw.surf(240,4,11,4,16-scenes.current_scene[scenes.dnum].x,5-scenes.current_scene[scenes.dnum].y,11,4)
-    -- elseif mood=="interessant" then
-    --     draw.surf(240,8,11,4,16-scenes.current_scene[scenes.dnum].x,5-scenes.current_scene[scenes.dnum].y,11,4)
-    -- else
-    --     abad.mood="normal"
-    -- end
+
     -- Dibuixar
     view.origin(ox, oy)
     surf.target(curr_sf)
@@ -392,6 +387,7 @@ function update_scene()
                 if scenes.die==0 then
                     if scenes.dnum==#scenes.current_scene then
                         if scene.stop_music then music.stop() end
+                        
                         -- if batman.endgame then
                         --     final_init()
                         --     fade.fadeoutin()