--- deliantra/server/lib/cf.pm	2007/08/30 08:34:40	1.348
+++ deliantra/server/lib/cf.pm	2007/09/02 00:57:38	1.351
@@ -2088,17 +2088,21 @@
 sub nuke {
    my ($self) = @_;
 
-   delete $cf::MAP{$self->path};
+   {
+      my $lock = cf::lock_acquire "map_data:$self->{path}";
 
-   $self->unlink_save;
+      delete $cf::MAP{$self->path};
 
-   bless $self, "cf::map";
-   delete $self->{deny_reset};
-   $self->{deny_save} = 1;
-   $self->reset_timeout (1);
-   $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
+      $self->unlink_save;
 
-   $cf::MAP{$self->path} = $self;
+      bless $self, "cf::map";
+      delete $self->{deny_reset};
+      $self->{deny_save} = 1;
+      $self->reset_timeout (1);
+      $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
+
+      $cf::MAP{$self->path} = $self;
+   }
 
    $self->reset; # polite request, might not happen
 }
@@ -2502,6 +2506,15 @@
 
 =cut
 
+our %CHANNEL = (
+   "c/identify" => {
+      id      => "identify",
+      title   => "Identify",
+      reply   => undef,
+      tooltip => "Items recently identified",
+   },
+);
+
 sub cf::client::send_msg {
    my ($self, $channel, $msg, $color, @extra) = @_;
 
@@ -2509,6 +2522,9 @@
 
    $color &= cf::NDI_CLIENT_MASK; # just in case...
 
+   # check predefined channels, for the benefit of C
+   $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
+
    if (ref $channel) {
       # send meta info to client, if not yet sent
       unless (exists $self->{channel}{$channel->{id}}) {