ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/player-env.ext
(Generate patch)

Comparing deliantra/server/ext/player-env.ext (file contents):
Revision 1.4 by root, Thu Jul 12 08:40:13 2007 UTC vs.
Revision 1.15 by root, Wed Sep 19 21:56:30 2007 UTC

… …
11 11
12 #TODO, sort by size (smallest first...) 12 #TODO, sort by size (smallest first...)
13 [ 13 [
14 sort { (cf::face::get_data_size $a) <=> (cf::face::get_data_size $b) } 14 sort { (cf::face::get_data_size $a) <=> (cf::face::get_data_size $b) }
15 grep $_, 15 grep $_,
16 map +(cf::face::find "$prefix$_"), 16 map +(cf::face::find "$prefix$_" or ((warn "unable to find music file $_"), undef)),
17 split /\s*,\s*/, $list 17 split /\s*,\s*/, $list
18 ] 18 ]
19} 19}
20 20
21our %MUSIC_QUEUE; 21our %MUSIC_QUEUE;
22our %MUSIC_FACE_CACHE; # cleared by reload_facedata
22 23
23our $MUSIC_SCHEDULER = cf::async_ext { 24our $MUSIC_SCHEDULER = cf::async_ext {
25 $Coro::current->{desc} = "music scheduler";
26
24 while () { 27 while () {
25 for (keys %MUSIC_QUEUE) { 28 for (keys %MUSIC_QUEUE) {
26 delete $MUSIC_QUEUE{$_}; 29 delete $MUSIC_QUEUE{$_};
27 my $pl = cf::player::find_active $_
28 or next;
29 30
30 my $ns = $pl->ns 31 cf::get_slot 0.01, -10, "music scheduler";
31 or next;
32 32
33 my $pl = cf::player::find_active $_ or next;
34 $pl->ob->active or next;
35 my $ns = $pl->ns or next;
33 $ns->extcmd 36 $ns->extcmd or next;
34 or next; 37 my $map = $pl->ob->map or next;
35 38
36 my $faces; 39 my $faces = $MUSIC_FACE_CACHE{$map} ||= do {
40 # 1. map-specific music info
41 parse_facelist "music/", $map->{music}
42 or do {
43 # 2. fall back to region if no map-specific music
44 my $rgn = $pl->ob->region
45 or next;
37 46
38 my $map = $pl->ob->map 47 my $par = $rgn;
39 or next; 48 while () {
49 last if exists $par->{music};
50 $par = $par->parent
51 or last;
52 }
40 53
41 # 1. update map-specific music info
42 unless (exists $map->{music_faces}) {
43 $map->{music_faces} = parse_facelist "music/", $map->{music}; 54 parse_facelist "music/", $par->{music}
44 }
45
46 my $faces = $map->{music_faces};
47
48 # 2. fall back to region if no map-specific music
49 unless ($faces) {
50 my $rgn = $pl->ob->region
51 or next;
52
53 unless (exists $rgn->{music_faces}) {
54 my $par = $rgn;
55 while () {
56 last if exists $par->{music};
57 $par = $par->parent
58 or last;
59 } 55 }
60
61 $rgn->{music_faces} = parse_facelist "music/", $par->{music};
62 } 56 ;
63
64 $faces = $rgn->{music_faces};
65 } 57 };
66 58
67 $faces 59 $faces
68 or next; 60 or next;
69 61
70 my $facestr = join ",", @$faces; 62 my $facestr = join ",", @$faces;
71 $ns->{current_music_faces} ne $facestr 63 $ns->{current_music_faces} ne $facestr
72 or next; 64 or next;
73 65
74 $ns->{current_music_faces} = $facestr; 66 $ns->{current_music_faces} = $facestr;
75 67
76 my $msg = { 68 my $pri = 0;
77 faces => $faces, 69 $ns->send_face ($_, --$pri - 110)
78 }; 70 for @$faces;
71 $ns->flush_fx;
79 72
80 $msg->{chksum}{$_} = cf::face::get_chksum $_
81 for grep $ns->must_send_face ($_), @$faces;
82
83 $ns->ext_event (music => %$msg); 73 $ns->ext_msg (ambient_music => $faces);
84
85 cf::cede_to_tick;
86 } 74 }
87 Coro::schedule unless %MUSIC_QUEUE; 75 Coro::schedule unless %MUSIC_QUEUE;
88 } 76 }
89}; 77};
90 78

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines