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.304 by root, Wed Jul 11 16:55:18 2007 UTC vs.
Revision 1.310 by elmex, Mon Jul 16 15:43:49 2007 UTC

… …
166=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
167 167
168These 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
169returns 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
170per 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.
171 177
172=back 178=back
173 179
174=cut 180=cut
175 181
… …
866 "; 872 ";
867 die if $@; 873 die if $@;
868} 874}
869 875
870our $override; 876our $override;
871our @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?
872 878
873sub override { 879sub override {
874 $override = 1; 880 $override = 1;
875 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
876} 882}
877 883
878sub do_invoke { 884sub do_invoke {
879 my $event = shift; 885 my $event = shift;
880 my $callbacks = shift; 886 my $callbacks = shift;
881 887
882 @invoke_results = (); 888 @INVOKE_RESULTS = ();
883 889
884 local $override; 890 local $override;
885 891
886 for (@$callbacks) { 892 for (@$callbacks) {
887 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
… …
904 910
905Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
906 912
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 916
911=back 917=back
912 918
913=cut 919=cut
914 920
… …
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)
… …
2766 my $meta = $enc->encode ({ 2777 my $meta = $enc->encode ({
2767 name => $name, 2778 name => $name,
2768 type => $info->{type}, 2779 type => $info->{type},
2769 copyright => $info->{copyright}, #TODO# 2780 copyright => $info->{copyright}, #TODO#
2770 }); 2781 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773 2782
2774 my $idx = (cf::face::find $name) || cf::face::alloc $name; 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
2775 cf::face::set_type $idx, 1; 2792 cf::face::set_type $idx, 1;
2776 cf::face::set_data $idx, 0, $data, $chk; 2793 cf::face::set_data $idx, 0, $data, $chk;
2794 }
2777 2795
2778 cf::cede_to_tick; 2796 cf::cede_to_tick;
2779 } 2797 }
2780 } 2798 }
2781 2799

Diff Legend

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