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.312 by root, Sat Jul 21 18:01:26 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
915############################################################################# 921#############################################################################
916# object support 922# object support
923#
924
925sub _can_merge {
926 my ($ob1, $ob2) = @_;
927
928 local $Storable::canonical = 1;
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931
932 $fob1 eq $fob2
933}
917 934
918sub reattach { 935sub reattach {
919 # basically do the same as instantiate, without calling instantiate 936 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 937 my ($obj) = @_;
921 938
… …
1619 $self->init; # pass $1 etc. 1636 $self->init; # pass $1 etc.
1620 return $self; 1637 return $self;
1621 } 1638 }
1622 } 1639 }
1623 1640
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1641 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1642 ()
1626} 1643}
1627 1644
1628sub init { 1645sub init {
1629 my ($self) = @_; 1646 my ($self) = @_;
… …
1907 1924
1908 undef $MAP_PREFETCH{$path}; 1925 undef $MAP_PREFETCH{$path};
1909 $MAP_PREFETCHER ||= cf::async { 1926 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 1927 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 1928 for my $path (keys %MAP_PREFETCH) {
1912 my $map = find $path 1929 if (my $map = find $path) {
1913 or next;
1914 $map->load; 1930 $map->load;
1931 }
1915 1932
1916 delete $MAP_PREFETCH{$path}; 1933 delete $MAP_PREFETCH{$path};
1917 } 1934 }
1918 } 1935 }
1919 undef $MAP_PREFETCHER; 1936 undef $MAP_PREFETCHER;
… …
2256 2273
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2275 $self->enter_map ($map, $x, $y);
2259} 2276}
2260 2277
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2278=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2279
2263Moves the player to the given map-path and coordinates by first freezing 2280Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2281her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2282that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2283the new (success) or old (failed) map position. In either case, $done will
2284be called at the end of this process.
2267 2285
2268=cut 2286=cut
2269 2287
2270our $GOTOGEN; 2288our $GOTOGEN;
2271 2289
2272sub cf::object::player::goto { 2290sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2291 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2292
2275 # do generation counting so two concurrent goto's will be executed in-order 2293 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2295
2278 $self->enter_link; 2296 $self->enter_link;
… …
2298 2316
2299 if ($gen == $self->{_goto_generation}) { 2317 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2318 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2319 $self->leave_link ($map, $x, $y);
2302 } 2320 }
2321
2322 $done->() if $done;
2303 })->prio (1); 2323 })->prio (1);
2304} 2324}
2305 2325
2306=item $player_object->enter_exit ($exit_object) 2326=item $player_object->enter_exit ($exit_object)
2307 2327
… …
2416 2436
2417 utf8::encode $text; 2437 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2438 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2439}
2420 2440
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2441=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2442
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2443Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2444client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2445the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2446the message unless the client supports the msg packet.
2427 2447
2428=cut 2448=cut
2429 2449
2430sub cf::client::send_msg { 2450sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2451 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2452
2433 $msg = $self->pl->expand_cfpod ($msg); 2453 $msg = $self->pl->expand_cfpod ($msg);
2434 2454
2435 return unless @extra || length $msg; 2455 return unless @extra || length $msg;
2436 2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case...
2458
2459 if (ref $channel) {
2460 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel);
2464 }
2465
2466 $channel = $channel->{id};
2467 }
2468
2437 if ($self->can_msg) { 2469 if ($self->can_msg) {
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2439 } else { 2471 } else {
2440 # replace some tags by gcfclient-compatible ones 2472 # replace some tags by gcfclient-compatible ones
2441 for ($msg) { 2473 for ($msg) {
2442 1 while 2474 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2464 2496
2465=cut 2497=cut
2466 2498
2467sub cf::client::ext_event($$%) { 2499sub cf::client::ext_event($$%) {
2468 my ($self, $type, %msg) = @_; 2500 my ($self, $type, %msg) = @_;
2501
2502 return unless $self->extcmd;
2469 2503
2470 $msg{msgtype} = "event_$type"; 2504 $msg{msgtype} = "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2472} 2506}
2473 2507
… …
2766 my $meta = $enc->encode ({ 2800 my $meta = $enc->encode ({
2767 name => $name, 2801 name => $name,
2768 type => $info->{type}, 2802 type => $info->{type},
2769 copyright => $info->{copyright}, #TODO# 2803 copyright => $info->{copyright}, #TODO#
2770 }); 2804 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773 2805
2774 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2806 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2807
2808 if ($name =~ /\.jpg$/) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2811 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2775 cf::face::set_type $idx, 1; 2815 cf::face::set_type $idx, 1;
2776 cf::face::set_data $idx, 0, $data, $chk; 2816 cf::face::set_data $idx, 0, $data, $chk;
2817 }
2777 2818
2778 cf::cede_to_tick; 2819 cf::cede_to_tick;
2779 } 2820 }
2780 } 2821 }
2781 2822

Diff Legend

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