--- deliantra/server/lib/cf.pm	2007/08/30 05:16:09	1.347
+++ deliantra/server/lib/cf.pm	2007/09/02 12:45:44	1.355
@@ -483,7 +483,7 @@
 
    # we seemingly have to make a local copy of the whole thing,
    # otherwise perl prematurely frees the stuff :/
-   # TODO: investigate and fix (liekly this will be rather laborious)
+   # TODO: investigate and fix (likely this will be rather laborious)
 
    my @res = Coro::Util::fork_eval {
       reset_signals;
@@ -1415,9 +1415,14 @@
    my @logins;
 
    for my $login (@$dirs) {
-      my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
-      aio_read $fh, 0, 512, my $buf, 0                  or next;
-      $buf !~ /^password -------------$/m               or next; # official not-valid tag
+      my $path = path $login;
+
+      # a .pst is a dead give-away for a valid player
+      unless (-e "$path.pst") {
+         my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
+         aio_read $fh, 0, 512, my $buf, 0            or next;
+         $buf !~ /^password -------------$/m         or next; # official not-valid tag
+      }
 
       utf8::decode $login;
       push @logins, $login;
@@ -1465,7 +1470,7 @@
 
    # escape & and <
    s/&/&amp;/g;
-   s/(?<![BIUGH])</&lt;/g;
+   s/(?<![BIUGHT])</&lt;/g;
 
    # this is buggy, it needs to properly take care of nested <'s
 
@@ -1474,6 +1479,7 @@
       s/B<([^\>]*)>/<b>$1<\/b>/
       || s/I<([^\>]*)>/<i>$1<\/i>/
       || s/U<([^\>]*)>/<u>$1<\/u>/
+      || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
       # replace G<male|female> tags
       || s{G<([^>|]*)\|([^>]*)>}{
          $self->gender ? $2 : $1
@@ -2088,17 +2094,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 +2512,21 @@
 
 =cut
 
+our %CHANNEL = (
+   "c/identify" => {
+      id      => "identify",
+      title   => "Identify",
+      reply   => undef,
+      tooltip => "Items recently identified",
+   },
+   "c/examine" => {
+      id      => "examine",
+      title   => "Examine",
+      reply   => undef,
+      tooltip => "Signs and other items you examined",
+   },
+);
+
 sub cf::client::send_msg {
    my ($self, $channel, $msg, $color, @extra) = @_;
 
@@ -2509,11 +2534,15 @@
 
    $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}}) {
          $self->{channel}{$channel->{id}} = $channel;
-         $self->ext_msg (channel_info => $channel);
+         $self->ext_msg (channel_info => $channel)
+            if $self->can_msg;
       }
 
       $channel = $channel->{id};
@@ -2838,6 +2867,10 @@
 sub load_facedata($) {
    my ($path) = @_;
 
+   # HACK to clear player env face cache, we need some signal framework
+   # for this (global event?)
+   %ext::player_env::MUSIC_FACE_CACHE = ();
+
    my $enc = JSON::XS->new->utf8->canonical->relaxed;
 
    warn "loading facedata from $path\n";
@@ -2958,6 +2991,10 @@
 };
 
 sub reload_regions {
+   # HACK to clear player env face cache, we need some signal framework
+   # for this (global event?)
+   %ext::player_env::MUSIC_FACE_CACHE = ();
+
    load_resource_file "$MAPDIR/regions"
       or die "unable to load regions file\n";