--- deliantra/server/lib/cf.pm	2007/08/18 17:33:53	1.332
+++ deliantra/server/lib/cf.pm	2007/08/28 19:38:40	1.346
@@ -23,7 +23,7 @@
 use Coro::Storable;
 use Coro::Util ();
 
-use JSON::XS 1.4 ();
+use JSON::XS ();
 use BDB ();
 use Data::Dumper;
 use Digest::MD5;
@@ -577,7 +577,7 @@
             join "\x00",
                $processversion,
                map {
-                  Coro::cede;
+                  cf::cede_to_tick;
                   ($src->[$_], Digest::MD5::md5_hex $data[$_])
                } 0.. $#$src;
            
@@ -1151,12 +1151,15 @@
                ? @$msg
                : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
 
-         if (my $cb = $EXTCMD{$type}) {
-            my @reply = $cb->($pl, @payload);
+         my @reply;
 
-            $pl->ext_reply ($reply, @reply)
-               if $reply;
+         if (my $cb = $EXTCMD{$type}) {
+            @reply = $cb->($pl, @payload);
          }
+
+         $pl->ext_reply ($reply, @reply)
+            if $reply;
+
       } else {
          warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
       }
@@ -1321,7 +1324,7 @@
    $pl->{last_save} = $cf::RUNTIME;
 
    $pl->save_pl ($path);
-   Coro::cede;
+   cf::cede_to_tick;
 }
 
 sub new($) {
@@ -1507,13 +1510,7 @@
 sub ext_reply($$@) {
    my ($self, $id, @msg) = @_;
 
-   if ($self->ns->extcmd == 2) {
-      $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
-   } elsif ($self->ns->extcmd == 1) {
-      #TODO: version 1, remove
-      unshift @msg, msgtype => "reply", msgid => $id;
-      $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
-   }
+   $self->ns->ext_reply ($id, @msg)
 }
 
 =item $player->ext_msg ($type, @msg)
@@ -1854,7 +1851,8 @@
    my $path = $self->{path};
 
    {
-      my $guard = cf::lock_acquire "map_load:$path";
+      my $guard1 = cf::lock_acquire "map_data:$path";
+      my $guard2 = cf::lock_acquire "map_load:$path";
 
       return if $self->in_memory != cf::MAP_SWAPPED;
 
@@ -1863,7 +1861,7 @@
       $self->alloc;
 
       $self->pre_load;
-      Coro::cede;
+      cf::cede_to_tick;
 
       $self->_load_objects ($self->{load_path}, 1)
          or return;
@@ -1879,20 +1877,20 @@
          }
       }
 
-      Coro::cede;
+      cf::cede_to_tick;
       # now do the right thing for maps
       $self->link_multipart_objects;
       $self->difficulty ($self->estimate_difficulty)
          unless $self->difficulty;
-      Coro::cede;
+      cf::cede_to_tick;
 
       unless ($self->{deny_activate}) {
          $self->decay_objects;
          $self->fix_auto_apply;
          $self->update_buttons;
-         Coro::cede;
+         cf::cede_to_tick;
          $self->set_darkness_map;
-         Coro::cede;
+         cf::cede_to_tick;
          $self->activate;
       }
 
@@ -1918,10 +1916,10 @@
 }
 
 # find and load all maps in the 3x3 area around a map
-sub load_diag {
+sub load_neighbours {
    my ($map) = @_;
 
-   my @diag; # diagonal neighbours
+   my @neigh; # diagonal neighbours
 
    for (0 .. 3) {
       my $neigh = $map->tile_path ($_)
@@ -1930,12 +1928,14 @@
          or next;
       $neigh->load;
 
-      push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
-                  [$neigh->tile_path (($_ + 1) % 4), $neigh];
+      push @neigh,
+         [$neigh->tile_path (($_ + 3) % 4), $neigh],
+         [$neigh->tile_path (($_ + 1) % 4), $neigh];
    }
 
-   for (@diag) {
-      my $neigh = find @$_
+   for (grep defined $_->[0], @neigh) {
+      my ($path, $origin) = @$_;
+      my $neigh = find $path, $origin
          or next;
       $neigh->load;
    }
@@ -1950,6 +1950,9 @@
 sub do_load_sync {
    my ($map) = @_;
 
+   cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
+      if $Coro::current == $Coro::main;
+
    cf::sync_job { $map->load };
 }
 
@@ -1957,23 +1960,24 @@
 our $MAP_PREFETCHER = undef;
 
 sub find_async {
-   my ($path, $origin) = @_;
+   my ($path, $origin, $load) = @_;
 
    $path = normalise $path, $origin && $origin->{path};
 
    if (my $map = $cf::MAP{$path}) {
-      return $map if $map->in_memory == cf::MAP_IN_MEMORY;
+      return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
    }
 
-   undef $MAP_PREFETCH{$path};
+   $MAP_PREFETCH{$path} |= $load;
+
    $MAP_PREFETCHER ||= cf::async {
       while (%MAP_PREFETCH) {
-         for my $path (keys %MAP_PREFETCH) {
-            if (my $map = find $path) {
-               $map->load;
+         while (my ($k, $v) = each %MAP_PREFETCH) {
+            if (my $map = find $k) {
+               $map->load if $v;
             }
 
-            delete $MAP_PREFETCH{$path};
+            delete $MAP_PREFETCH{$k};
          }
       }
       undef $MAP_PREFETCHER;
@@ -1986,7 +1990,7 @@
 sub save {
    my ($self) = @_;
 
-   my $lock = cf::lock_acquire "map_data:" . $self->path;
+   my $lock = cf::lock_acquire "map_data:$self->{path}";
 
    $self->{last_save} = $cf::RUNTIME;
 
@@ -2019,7 +2023,7 @@
    # save first because save cedes
    $self->save;
 
-   my $lock = cf::lock_acquire "map_data:" . $self->path;
+   my $lock = cf::lock_acquire "map_data:$self->{path}";
 
    return if $self->players;
    return if $self->in_memory != cf::MAP_IN_MEMORY;
@@ -2314,7 +2318,7 @@
       if $x <=0 && $y <= 0;
 
    $map->load;
-   $map->load_diag;
+   $map->load_neighbours;
 
    return unless $self->contr->active;
    $self->activate_recursive;
@@ -2557,16 +2561,32 @@
 sub cf::client::ext_msg($$@) {
    my ($self, $type, @msg) = @_;
 
-   my $extcmd = $self->extcmd;
-
-   if ($extcmd == 2) {
+   if ($self->extcmd == 2) {
       $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
-   } elsif ($extcmd == 1) { # TODO: remove
+   } elsif ($self->extcmd == 1) { # TODO: remove
       push @msg, msgtype => "event_$type";
       $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
    }
 }
 
+=item $client->ext_reply ($msgid, @msg)
+
+Sends an ext reply to the client.
+
+=cut
+
+sub cf::client::ext_reply($$@) {
+   my ($self, $id, @msg) = @_;
+
+   if ($self->extcmd == 2) {
+      $self->send_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}));
+   }
+}
+
 =item $success = $client->query ($flags, "text", \&cb)
 
 Queues a query to the client, calling the given callback with
@@ -2634,12 +2654,15 @@
                ? @$msg
                : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
 
-         if (my $cb = $EXTICMD{$type}) {
-            my @reply = $cb->($ns, @payload);
+         my @reply;
 
-            $ns->ext_reply ($reply, @reply)
-               if $reply;
+         if (my $cb = $EXTICMD{$type}) {
+            @reply = $cb->($ns, @payload);
          }
+
+         $ns->ext_reply ($reply, @reply)
+            if $reply;
+
       } else {
          warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
       }
@@ -2710,7 +2733,7 @@
 
   cf::object
      contr pay_amount pay_player map x y force_find force_add
-     insert remove name archname title slaying race
+     insert remove name archname title slaying race decrease_ob_nr
 
   cf::object::player
      player
@@ -2725,7 +2748,8 @@
 
 for (
    ["cf::object"         => qw(contr pay_amount pay_player map force_find force_add x y
-                               insert remove inv name archname title slaying race)],
+                               insert remove inv name archname title slaying race
+                               decrease_ob_nr)],
    ["cf::object::player" => qw(player)],
    ["cf::player"         => qw(peaceful)],
    ["cf::map"            => qw(trigger)],
@@ -2811,6 +2835,8 @@
 sub load_facedata($) {
    my ($path) = @_;
 
+   my $enc = JSON::XS->new->utf8->canonical->relaxed;
+
    warn "loading facedata from $path\n";
 
    my $facedata;
@@ -2822,6 +2848,13 @@
    $facedata->{version} == 2
       or cf::cleanup "$path: version mismatch, cannot proceed.";
 
+   # patch in the exptable
+   $facedata->{resource}{"res/exp_table"} = {
+      type => FT_RSRC,
+      data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
+   };
+   cf::cede_to_tick;
+
    {
       my $faces = $facedata->{faceinfo};
 
@@ -2829,8 +2862,8 @@
          my $idx = (cf::face::find $face) || cf::face::alloc $face;
          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};
+         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::cede_to_tick;
       }
@@ -2865,29 +2898,27 @@
       # 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;
 
       my $soundconf = delete $res->{"res/sound.conf"};
 
       while (my ($name, $info) = each %$res) {
-         my $meta = $enc->encode ({
-            name => $name,
-            %{ $info->{meta} || {} },
-         });
-
          my $idx = (cf::face::find $name) || cf::face::alloc $name;
+         my $data;
 
          if ($info->{type} & 1) {
             # prepend meta info
 
-            my $data = pack "(w/a*)*", $meta, $info->{data};
-            my $chk  = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
+            my $meta = $enc->encode ({
+               name => $name,
+               %{ $info->{meta} || {} },
+            });
 
-            cf::face::set_data $idx, 0, $data, $chk;
+            $data = pack "(w/a*)*", $meta, $info->{data};
          } else {
-            cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
+            $data = $info->{data};
          }
 
+         cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
          cf::face::set_type $idx, $info->{type};
 
          cf::cede_to_tick;
@@ -2969,7 +3000,7 @@
    reload_resources;
 }
 
-sub cfg_load {
+sub reload_config {
    open my $fh, "<:utf8", "$CONFDIR/config"
       or return;
 
@@ -2999,7 +3030,7 @@
       })->prio (Coro::PRIO_MAX);
    };
 
-   cfg_load;
+   reload_config;
    db_init;
    load_extensions;
 
@@ -3202,7 +3233,7 @@
       cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
 
       warn "loading config and database again";
-      cf::cfg_load;
+      cf::reload_config;
 
       warn "loading extensions";
       cf::load_extensions;