ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.343 by root, Mon Aug 27 01:13:48 2007 UTC

… …
1149 my ($type, $reply, @payload) = 1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1150 "ARRAY" eq ref $msg
1151 ? @$msg 1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1153
1154 my @reply;
1155
1154 if (my $cb = $EXTCMD{$type}) { 1156 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1157 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1160 } else { 1163 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1165 }
1163 1166
1164 cf::override; 1167 cf::override;
… …
1944} 1947}
1945 1948
1946sub do_load_sync { 1949sub do_load_sync {
1947 my ($map) = @_; 1950 my ($map) = @_;
1948 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1949 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1950} 1956}
1951 1957
1952our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1954 1960
1955sub find_async { 1961sub find_async {
1956 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1957 1963
1958 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
1959 1965
1960 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 1968 }
1963 1969
1964 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
1965 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
1966 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 1975 if (my $map = find $k) {
1969 $map->load; 1976 $map->load if $v;
1970 } 1977 }
1971 1978
1972 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
1973 } 1980 }
1974 } 1981 }
1975 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
1976 }; 1983 };
1977 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
… …
2551=cut 2558=cut
2552 2559
2553sub cf::client::ext_msg($$@) { 2560sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2561 my ($self, $type, @msg) = @_;
2555 2562
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2563 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2565 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2566 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2567 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2568 }
2564} 2569}
2565 2570
… …
2572sub cf::client::ext_reply($$@) { 2577sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2578 my ($self, $id, @msg) = @_;
2574 2579
2575 if ($self->extcmd == 2) { 2580 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2581 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2582 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2583 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2584 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2585 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2586 }
2582} 2587}
… …
2646 my ($type, $reply, @payload) = 2651 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2652 "ARRAY" eq ref $msg
2648 ? @$msg 2653 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2654 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2655
2656 my @reply;
2657
2651 if (my $cb = $EXTICMD{$type}) { 2658 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2659 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2660 }
2661
2662 $ns->ext_reply ($reply, @reply)
2663 if $reply;
2664
2657 } else { 2665 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2666 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2667 }
2660 2668
2661 cf::override; 2669 cf::override;
… …
2722 2730
2723The following functions and methods are available within a safe environment: 2731The following functions and methods are available within a safe environment:
2724 2732
2725 cf::object 2733 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 2734 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race 2735 insert remove name archname title slaying race decrease_ob_nr
2728 2736
2729 cf::object::player 2737 cf::object::player
2730 player 2738 player
2731 2739
2732 cf::player 2740 cf::player
… …
2737 2745
2738=cut 2746=cut
2739 2747
2740for ( 2748for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2749 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 2750 insert remove inv name archname title slaying race
2751 decrease_ob_nr)],
2743 ["cf::object::player" => qw(player)], 2752 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2753 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2754 ["cf::map" => qw(trigger)],
2746) { 2755) {
2747 no strict 'refs'; 2756 no strict 'refs';
… …
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 2848 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 2849
2841 # patch in the exptable 2850 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = { 2851 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 2852 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 2853 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 }; 2854 };
2846 cf::cede_to_tick; 2855 cf::cede_to_tick;
2847 2856
2848 { 2857 {
2849 my $faces = $facedata->{faceinfo}; 2858 my $faces = $facedata->{faceinfo};
… …
2902 name => $name, 2911 name => $name,
2903 %{ $info->{meta} || {} }, 2912 %{ $info->{meta} || {} },
2904 }); 2913 });
2905 2914
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 2915 $data = pack "(w/a*)*", $meta, $info->{data};
2916 } else {
2917 $data = $info->{data};
2907 } 2918 }
2908 2919
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 2920 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type}; 2921 cf::face::set_type $idx, $info->{type};
2911 2922

Diff Legend

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