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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.310 by elmex, Mon Jul 16 15:43:49 2007 UTC

… …
29use Fcntl; 29use Fcntl;
30use YAML::Syck (); 30use YAML::Syck ();
31use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
32use Time::HiRes; 32use Time::HiRes;
33use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
34 35
35# configure various modules to our taste 36# configure various modules to our taste
36# 37#
37$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
166 167
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 169returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
170 177
171=back 178=back
172 179
173=cut 180=cut
174 181
… …
865 "; 872 ";
866 die if $@; 873 die if $@;
867} 874}
868 875
869our $override; 876our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 877our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 878
872sub override { 879sub override {
873 $override = 1; 880 $override = 1;
874 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
875} 882}
876 883
877sub do_invoke { 884sub do_invoke {
878 my $event = shift; 885 my $event = shift;
879 my $callbacks = shift; 886 my $callbacks = shift;
880 887
881 @invoke_results = (); 888 @INVOKE_RESULTS = ();
882 889
883 local $override; 890 local $override;
884 891
885 for (@$callbacks) { 892 for (@$callbacks) {
886 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
… …
903 910
904Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
905 912
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 913This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 914removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 916
910=back 917=back
911 918
912=cut 919=cut
913 920
… …
1435 s/\s+\n/\n/g; # ws line-ends 1442 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1443 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1444 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1445 s/\n+$//; # ending lines
1439 1446
1440 warn $_;#d#
1441 $_ 1447 $_
1442} 1448}
1443 1449
1444sub hintmode { 1450sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1451 $_[0]{hintmode} = $_[1] if @_ > 1;
… …
1489 my ($path) = @_; 1495 my ($path) = @_;
1490 1496
1491 my ($match, $specificity); 1497 my ($match, $specificity);
1492 1498
1493 for my $region (list) { 1499 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1500 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1501 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1502 if $region->specificity > $specificity;
1497 } 1503 }
1498 } 1504 }
1499 1505
… …
1619 $self->init; # pass $1 etc. 1625 $self->init; # pass $1 etc.
1620 return $self; 1626 return $self;
1621 } 1627 }
1622 } 1628 }
1623 1629
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1630 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1631 ()
1626} 1632}
1627 1633
1628sub init { 1634sub init {
1629 my ($self) = @_; 1635 my ($self) = @_;
… …
1907 1913
1908 undef $MAP_PREFETCH{$path}; 1914 undef $MAP_PREFETCH{$path};
1909 $MAP_PREFETCHER ||= cf::async { 1915 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 1916 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 1917 for my $path (keys %MAP_PREFETCH) {
1912 my $map = find $path 1918 if (my $map = find $path) {
1913 or next;
1914 $map->load; 1919 $map->load;
1920 }
1915 1921
1916 delete $MAP_PREFETCH{$path}; 1922 delete $MAP_PREFETCH{$path};
1917 } 1923 }
1918 } 1924 }
1919 undef $MAP_PREFETCHER; 1925 undef $MAP_PREFETCHER;
… …
2256 2262
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2264 $self->enter_map ($map, $x, $y);
2259} 2265}
2260 2266
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2268
2263Moves the player to the given map-path and coordinates by first freezing 2269Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2270her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2271that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2272the new (success) or old (failed) map position. In either case, $done will
2273be called at the end of this process.
2267 2274
2268=cut 2275=cut
2269 2276
2270our $GOTOGEN; 2277our $GOTOGEN;
2271 2278
2272sub cf::object::player::goto { 2279sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2280 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2281
2275 # do generation counting so two concurrent goto's will be executed in-order 2282 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2284
2278 $self->enter_link; 2285 $self->enter_link;
… …
2298 2305
2299 if ($gen == $self->{_goto_generation}) { 2306 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2307 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2308 $self->leave_link ($map, $x, $y);
2302 } 2309 }
2310
2311 $done->() if $done;
2303 })->prio (1); 2312 })->prio (1);
2304} 2313}
2305 2314
2306=item $player_object->enter_exit ($exit_object) 2315=item $player_object->enter_exit ($exit_object)
2307 2316
… …
2465=cut 2474=cut
2466 2475
2467sub cf::client::ext_event($$%) { 2476sub cf::client::ext_event($$%) {
2468 my ($self, $type, %msg) = @_; 2477 my ($self, $type, %msg) = @_;
2469 2478
2479 return unless $self->extcmd;
2480
2470 $msg{msgtype} = "event_$type"; 2481 $msg{msgtype} = "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2472} 2483}
2473 2484
2474=item $success = $client->query ($flags, "text", \&cb) 2485=item $success = $client->query ($flags, "text", \&cb)
… …
2720 { 2731 {
2721 my $faces = $facedata->{faceinfo}; 2732 my $faces = $facedata->{faceinfo};
2722 2733
2723 while (my ($face, $info) = each %$faces) { 2734 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2735 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2736 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2728 Coro::cede; 2740
2741 cf::cede_to_tick;
2729 } 2742 }
2730 2743
2731 while (my ($face, $info) = each %$faces) { 2744 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 2745 next unless $info->{smooth};
2733 my $idx = cf::face::find $face 2746 my $idx = cf::face::find $face
2734 or next; 2747 or next;
2735 if (my $smooth = cf::face::find $info->{smooth}) { 2748 if (my $smooth = cf::face::find $info->{smooth}) {
2749 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2750 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 2751 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2752 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 2753 }
2740 Coro::cede; 2754
2755 cf::cede_to_tick;
2741 } 2756 }
2742 } 2757 }
2743 2758
2744 { 2759 {
2745 my $anims = $facedata->{animinfo}; 2760 my $anims = $facedata->{animinfo};
2746 2761
2747 while (my ($anim, $info) = each %$anims) { 2762 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2763 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 2764 cf::cede_to_tick;
2750 } 2765 }
2751 2766
2752 cf::anim::invalidate_all; # d'oh 2767 cf::anim::invalidate_all; # d'oh
2768 }
2769
2770 {
2771 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical;
2775
2776 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({
2778 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO#
2781 });
2782
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2784
2785 if ($name =~ /\.jpg$/) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2788 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data};
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk;
2794 }
2795
2796 cf::cede_to_tick;
2797 }
2753 } 2798 }
2754 2799
2755 1 2800 1
2756} 2801}
2757 2802
2758sub reload_regions { 2803sub reload_regions {
2759 load_resource_file "$MAPDIR/regions" 2804 load_resource_file "$MAPDIR/regions"
2760 or die "unable to load regions file\n"; 2805 or die "unable to load regions file\n";
2806
2807 for (cf::region::list) {
2808 $_->{match} = qr/$_->{match}/
2809 if exists $_->{match};
2810 }
2761} 2811}
2762 2812
2763sub reload_facedata { 2813sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 2814 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 2815 or die "unable to load facedata\n";

Diff Legend

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