--- deliantra/server/lib/cf.pm	2007/07/10 06:44:29	1.300
+++ deliantra/server/lib/cf.pm	2007/07/15 22:39:48	1.307
@@ -31,6 +31,7 @@
 use IO::AIO 2.32 ();
 use Time::HiRes;
 use Compress::LZF;
+use Digest::MD5 ();
 
 # configure various modules to our taste
 #
@@ -1437,7 +1438,6 @@
    s/^\n+//;     # beginning lines
    s/\n+$//;     # ending lines
 
-   warn $_;#d#
    $_
 }
 
@@ -1491,7 +1491,7 @@
    my ($match, $specificity);
 
    for my $region (list) {
-      if ($region->match && $path =~ $region->match) {
+      if ($region->{match} && $path =~ $region->{match}) {
          ($match, $specificity) = ($region, $region->specificity)
             if $region->specificity > $specificity;
       }
@@ -2258,19 +2258,20 @@
    $self->enter_map ($map, $x, $y);
 }
 
-=item $player_object->goto ($path, $x, $y[, $check->($map)])
+=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
 
 Moves the player to the given map-path and coordinates by first freezing
 her, loading and preparing them map, calling the provided $check callback
 that has to return the map if sucecssful, and then unfreezes the player on
-the new (success) or old (failed) map position.
+the new (success) or old (failed) map position. In either case, $done will
+be called at the end of this process.
 
 =cut
 
 our $GOTOGEN;
 
 sub cf::object::player::goto {
-   my ($self, $path, $x, $y, $check) = @_;
+   my ($self, $path, $x, $y, $check, $done) = @_;
 
    # do generation counting so two concurrent goto's will be executed in-order
    my $gen = $self->{_goto_generation} = ++$GOTOGEN;
@@ -2300,6 +2301,8 @@
          delete $self->{_goto_generation};
          $self->leave_link ($map, $x, $y);
       }
+
+      $done->() if $done;
    })->prio (1);
 }
 
@@ -2467,6 +2470,8 @@
 sub cf::client::ext_event($$%) {
    my ($self, $type, %msg) = @_;
 
+   return unless $self->extcmd;
+
    $msg{msgtype} = "event_$type";
    $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
 }
@@ -2722,10 +2727,12 @@
 
       while (my ($face, $info) = each %$faces) {
          my $idx = (cf::face::find $face) || cf::face::alloc $face;
-         cf::face::set $idx, $info->{visibility}, $info->{magicmap};
+         cf::face::set_visibility $idx, $info->{visibility};
+         cf::face::set_magicmap   $idx, $info->{magicmap};
          cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
          cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
-         Coro::cede;
+
+         cf::cede_to_tick;
       }
 
       while (my ($face, $info) = each %$faces) {
@@ -2733,11 +2740,13 @@
          my $idx = cf::face::find $face
             or next;
          if (my $smooth = cf::face::find $info->{smooth}) {
-            cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
+            cf::face::set_smooth      $idx, $smooth;
+            cf::face::set_smoothlevel $idx, $info->{smoothlevel};
          } else {
             warn "smooth face '$info->{smooth}' not found for face '$face'";
          }
-         Coro::cede;
+
+         cf::cede_to_tick;
       }
    }
 
@@ -2746,18 +2755,53 @@
 
       while (my ($anim, $info) = each %$anims) {
          cf::anim::set $anim, $info->{frames}, $info->{facings};
-         Coro::cede;
+         cf::cede_to_tick;
       }
 
       cf::anim::invalidate_all; # d'oh
    }
 
+   {
+      # TODO: for gcfclient pleasure, we should give resources
+      # that gcfclient doesn't grok a >10000 face index.
+      my $res = $facedata->{resource};
+      my $enc = JSON::XS->new->utf8->canonical;
+
+      while (my ($name, $info) = each %$res) {
+         my $meta = $enc->encode ({
+            name      => $name,
+            type      => $info->{type},
+            copyright => $info->{copyright}, #TODO#
+         });
+
+         my $idx = (cf::face::find $name) || cf::face::alloc $name;
+
+         if ($name =~ /\.jpg$/) {
+            cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
+            cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
+         } else {
+            my $data = pack "(w/a*)*", $meta, $info->{data};
+            my $chk  = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
+
+            cf::face::set_type $idx, 1;
+            cf::face::set_data $idx, 0, $data, $chk;
+         }
+
+         cf::cede_to_tick;
+      }
+   }
+
    1
 }
 
 sub reload_regions {
    load_resource_file "$MAPDIR/regions"
       or die "unable to load regions file\n";
+
+   for (cf::region::list) {
+      $_->{match} = qr/$_->{match}/
+         if exists $_->{match};
+   }
 }
 
 sub reload_facedata {