--- deliantra/server/lib/cf.pm	2009/10/23 03:08:35	1.489
+++ deliantra/server/lib/cf.pm	2010/01/05 16:16:37	1.498
@@ -34,6 +34,7 @@
 use Safe;
 use Safe::Hole;
 use Storable ();
+use Carp ();
 
 use Guard ();
 use Coro ();
@@ -54,7 +55,6 @@
 use JSON::XS 2.01 ();
 use BDB ();
 use Data::Dumper;
-use Digest::MD5;
 use Fcntl;
 use YAML::XS ();
 use IO::AIO ();
@@ -291,7 +291,7 @@
 }
 
 $EV::DIED = sub {
-   warn "error in event callback: @_";
+   Carp::cluck "error in event callback: @_";
 };
 
 #############################################################################
@@ -2346,7 +2346,8 @@
 =item cf::map::static_maps
 
 Returns an arrayref if paths of all static maps (all preinstalled F<.map>
-file in the shared directory). May block.
+file in the shared directory excluding F</styles> and F</editor>). May
+block.
 
 =cut
 
@@ -2357,6 +2358,8 @@
    while (@dirs) {
       my $dir = shift @dirs;
 
+      next if $dir eq "/styles" || $dir eq "/editor";
+
       my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
          or return;
 
@@ -2576,7 +2579,7 @@
 
    # use -1 or undef as default coordinates, not 0, 0
    ($x, $y) = ($map->enter_x, $map->enter_y)
-      if $x <=0 && $y <= 0;
+      if $x <= 0 && $y <= 0;
 
    $map->load;
    $map->load_neighbours;
@@ -2785,6 +2788,31 @@
    $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
 }
 
+=item $client->send_big_packet ($pkt)
+
+Like C<send_packet>, but tries to compress large packets, and fragments
+them as required.
+
+=cut
+
+our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
+
+sub cf::client::send_big_packet {
+   my ($self, $pkt) = @_;
+
+   # try lzf for large packets
+   $pkt = "lzf " . Compress::LZF::compress $pkt
+      if 1024 <= length $pkt and $self->{can_lzf};
+
+   # split very large packets
+   if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
+      $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
+      $pkt = "frag";
+   }
+
+   $self->send_packet ($pkt);
+}
+
 =item $client->send_msg ($channel, $msg, $color, [extra...])
 
 Send a drawinfo or msg packet to the client, formatting the msg for the
@@ -2944,17 +2972,7 @@
                 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
              );
 
-   # try lzf for large packets
-   $pkt = "lzf " . Compress::LZF::compress $pkt
-      if 1024 <= length $pkt and $self->{can_lzf};
-
-   # split very large packets
-   if (8192 < length $pkt and $self->{can_lzf}) {
-      $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
-      $pkt = "frag";
-   }
-
-   $self->send_packet ($pkt);
+   $self->send_big_packet ($pkt);
 }
 
 =item $client->ext_msg ($type, @msg)
@@ -2967,10 +2985,10 @@
    my ($self, $type, @msg) = @_;
 
    if ($self->extcmd == 2) {
-      $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
+      $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
    } elsif ($self->extcmd == 1) { # TODO: remove
       push @msg, msgtype => "event_$type";
-      $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
+      $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
    }
 }
 
@@ -2984,11 +3002,11 @@
    my ($self, $id, @msg) = @_;
 
    if ($self->extcmd == 2) {
-      $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
+      $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
    } elsif ($self->extcmd == 1) {
       #TODO: version 1, remove
       unshift @msg, msgtype => "reply", msgid => $id;
-      $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
+      $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
    }
 }
 
@@ -3125,7 +3143,7 @@
 $SIG{FPE} = 'IGNORE';
 
 $safe->permit_only (Opcode::opset qw(
-   :base_core :base_mem :base_orig :base_math
+   :base_core :base_mem :base_orig :base_math :base_loop
    grepstart grepwhile mapstart mapwhile
    sort time
 ));
@@ -3275,8 +3293,8 @@
 
          cf::face::set_visibility $idx, $info->{visibility};
          cf::face::set_magicmap   $idx, $info->{magicmap};
-         cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
-         cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
+         cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
+         cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
 
          cf::cede_to_tick;
       }
@@ -3310,29 +3328,13 @@
    }
 
    {
-      # TODO: for gcfclient pleasure, we should give resources
-      # that gcfclient doesn't grok a >10000 face index.
       my $res = $facedata->{resource};
 
       while (my ($name, $info) = each %$res) {
          if (defined $info->{type}) {
             my $idx = (cf::face::find $name) || cf::face::alloc $name;
-            my $data;
-
-            if ($info->{type} & 1) {
-               # prepend meta info
 
-               my $meta = $enc->encode ({
-                  name => $name,
-                  %{ $info->{meta} || {} },
-               });
-
-               $data = pack "(w/a*)*", $meta, $info->{data};
-            } else {
-               $data = $info->{data};
-            }
-
-            cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
+            cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
             cf::face::set_type $idx, $info->{type};
          } else {
             $RESOURCE{$name} = $info;
@@ -3505,12 +3507,13 @@
    evthread_start IO::AIO::poll_fileno;
 
    cf::sync_job {
+      cf::load_settings;
+      cf::load_materials;
+
       reload_resources;
       reload_config;
       db_init;
 
-      cf::load_settings;
-      cf::load_materials;
       cf::init_uuid;
       cf::init_signals;
       cf::init_commands;
@@ -3879,7 +3882,7 @@
 our @WAIT_FOR_TICK_BEGIN;
 
 sub wait_for_tick {
-   return if tick_inhibit || $Coro::current == $Coro::main;
+   return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
 
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK, $signal;
@@ -3887,7 +3890,7 @@
 }
 
 sub wait_for_tick_begin {
-   return if tick_inhibit || $Coro::current == $Coro::main;
+   return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
 
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK_BEGIN, $signal;