--- deliantra/server/ext/player-env.ext	2007/07/23 17:53:55	1.9
+++ deliantra/server/ext/player-env.ext	2007/08/30 08:34:40	1.14
@@ -19,6 +19,7 @@
 }
 
 our %MUSIC_QUEUE;
+our %MUSIC_FACE_CACHE; # cleared by reload_facedata
 
 our $MUSIC_SCHEDULER = cf::async_ext {
    while () {
@@ -33,33 +34,25 @@
          $ns->extcmd or next;
          my $map = $pl->ob->map or next;
 
-         my $faces;
+         my $faces = $MUSIC_FACE_CACHE{$map} ||= do {
+            # 1. map-specific music info
+            parse_facelist "music/", $map->{music}
+               or do {
+                  # 2. fall back to region if no map-specific music
+                  my $rgn = $pl->ob->region
+                     or next;
+
+                  my $par = $rgn;
+                  while () {
+                     last if exists $par->{music};
+                     $par = $par->parent
+                        or last;
+                  }
 
-         # 1. update map-specific music info
-         unless (exists $map->{music_faces}) {
-            $map->{music_faces} = parse_facelist "music/", $map->{music};
-         }
-
-         my $faces = $map->{music_faces};
-
-         # 2. fall back to region if no map-specific music
-         unless ($faces) {
-            my $rgn = $pl->ob->region
-               or next;
-
-            unless (exists $rgn->{music_faces}) {
-               my $par = $rgn;
-               while () {
-                  last if exists $par->{music};
-                  $par = $par->parent
-                     or last;
+                  parse_facelist "music/", $par->{music}
                }
-
-               $rgn->{music_faces} = parse_facelist "music/", $par->{music};
-            }
-
-            $faces = $rgn->{music_faces};
-         }
+            ;
+         };
 
          $faces
             or next;
@@ -70,15 +63,12 @@
 
          $ns->{current_music_faces} = $facestr;
 
-         my $msg = {
-            play => $faces,
-         };
-
          my $pri = 0;
-         push @{$msg->{faces}}, [$_, $pri++, cf::face::get_chksum $_]
-            for grep $ns->must_send_face ($_), @$faces;
+         $ns->send_face ($_, --$pri - 110)
+            for @$faces;
+         $ns->flush_fx;
 
-         $ns->ext_event (music => %$msg);
+         $ns->ext_msg (ambient_music => $faces);
       }
       Coro::schedule unless %MUSIC_QUEUE;
    }