--- deliantra/server/lib/cf.pm	2007/08/24 00:26:10	1.339
+++ deliantra/server/lib/cf.pm	2007/08/28 19:30:11	1.345
@@ -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;
@@ -1851,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;
 
@@ -1950,7 +1951,7 @@
    my ($map) = @_;
 
    cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
-      if $Coro::current != $Coro::main;
+      if $Coro::current == $Coro::main;
 
    cf::sync_job { $map->load };
 }
@@ -1964,7 +1965,7 @@
    $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;
    }
 
    $MAP_PREFETCH{$path} |= $load;
@@ -1989,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;
 
@@ -2022,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;
@@ -2560,11 +2561,9 @@
 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}));
    }
@@ -2581,7 +2580,7 @@
 
    if ($self->extcmd == 2) {
       $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
-   } elsif ($self->ns->extcmd == 1) {
+   } elsif ($self->extcmd == 1) {
       #TODO: version 1, remove
       unshift @msg, msgtype => "reply", msgid => $id;
       $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
@@ -2734,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
@@ -2749,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)],
@@ -2835,7 +2835,7 @@
 sub load_facedata($) {
    my ($path) = @_;
 
-   my $enc = JSON::XS->new->utf8->canonical;
+   my $enc = JSON::XS->new->utf8->canonical->relaxed;
 
    warn "loading facedata from $path\n";
 
@@ -3000,7 +3000,7 @@
    reload_resources;
 }
 
-sub cfg_load {
+sub reload_config {
    open my $fh, "<:utf8", "$CONFDIR/config"
       or return;
 
@@ -3030,7 +3030,7 @@
       })->prio (Coro::PRIO_MAX);
    };
 
-   cfg_load;
+   reload_config;
    db_init;
    load_extensions;
 
@@ -3233,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;