--- deliantra/server/lib/cf.pm	2009/09/02 16:54:20	1.476
+++ deliantra/server/lib/cf.pm	2009/10/23 03:08:35	1.489
@@ -1,23 +1,24 @@
-# 
+#
 # This file is part of Deliantra, the Roguelike Realtime MMORPG.
 # 
 # Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
 # 
-# Deliantra is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Deliantra is free software: you can redistribute it and/or modify it under
+# the terms of the Affero GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 # 
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the Affero GNU General Public License
+# and the GNU General Public License along with this program. If not, see
+# <http://www.gnu.org/licenses/>.
 # 
 # The authors can be reached via e-mail to <support@deliantra.net>
-# 
+#
 
 package cf;
 
@@ -55,7 +56,7 @@
 use Data::Dumper;
 use Digest::MD5;
 use Fcntl;
-use YAML ();
+use YAML::XS ();
 use IO::AIO ();
 use Time::HiRes;
 use Compress::LZF;
@@ -90,6 +91,8 @@
 
 our $RELOAD; # number of reloads so far, non-zero while in reload
 our @EVENT;
+our @REFLECT; # set by XS
+our %REFLECT; # set by us
 
 our $CONFDIR     = confdir;
 our $DATADIR     = datadir;
@@ -117,7 +120,7 @@
 our $BDB_TRICKLE_WATCHER;
 our $DB_ENV;
 
-our @EXTRA_MODULES = qw(pod mapscript);
+our @EXTRA_MODULES = qw(pod match mapscript);
 
 our %CFG;
 
@@ -163,6 +166,17 @@
 
 #############################################################################
 
+%REFLECT = ();
+for (@REFLECT) {
+   my $reflect = JSON::XS::decode_json $_;
+   $REFLECT{$reflect->{class}} = $reflect;
+}
+
+# this is decidedly evil
+$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
+
+#############################################################################
+
 =head2 GLOBAL VARIABLES
 
 =over 4
@@ -216,42 +230,45 @@
 
 =item @cf::INVOKE_RESULTS
 
-This array contains the results of the last C<invoke ()> call.  When
+This array contains the results of the last C<invoke ()> call. When
 C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
 that call.
 
+=item %cf::REFLECT
+
+Contains, for each (C++) class name, a hash reference with information
+about object members (methods, scalars, arrays and flags) and other
+metadata, which is useful for introspection.
+
 =back
 
 =cut
 
-BEGIN {
-   *CORE::GLOBAL::warn = sub {
-      my $msg = join "", @_;
+$Coro::State::WARNHOOK = sub {
+   my $msg = join "", @_;
 
-      $msg .= "\n"
-         unless $msg =~ /\n$/;
+   $msg .= "\n"
+      unless $msg =~ /\n$/;
 
-      $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
+   $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
 
-      LOG llevError, $msg;
-   };
-}
+   LOG llevError, $msg;
+};
 
 $Coro::State::DIEHOOK = sub {
    return unless $^S eq 0; # "eq", not "=="
 
+   warn Carp::longmess $_[0];
+
    if ($Coro::current == $Coro::main) {#d#
       warn "DIEHOOK called in main context, Coro bug?\n";#d#
       return;#d#
    }#d#
 
    # kill coroutine otherwise
-   warn Carp::longmess $_[0];
    Coro::terminate
 };
 
-$SIG{__DIE__} = sub { }; #d#?
-
 @safe::cf::global::ISA         = @cf::global::ISA         = 'cf::attachable';
 @safe::cf::object::ISA         = @cf::object::ISA         = 'cf::attachable';
 @safe::cf::player::ISA         = @cf::player::ISA         = 'cf::attachable';
@@ -2225,7 +2242,7 @@
 
    return if $self->players;
 
-   warn "resetting map ", $self->path;
+   warn "resetting map ", $self->path, "\n";
 
    $self->in_memory (cf::MAP_SWAPPED);
 
@@ -2326,6 +2343,35 @@
    ]
 }
 
+=item cf::map::static_maps
+
+Returns an arrayref if paths of all static maps (all preinstalled F<.map>
+file in the shared directory). May block.
+
+=cut
+
+sub static_maps() {
+   my @dirs = "";
+   my @maps;
+
+   while (@dirs) {
+      my $dir = shift @dirs;
+
+      my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
+         or return;
+
+      for (@$files) {
+         s/\.map$// or next;
+         utf8::decode $_;
+         push @maps, "$dir/$_";
+      }
+
+      push @dirs, map "$dir/$_", @$dirs;
+   }
+
+   \@maps
+}
+
 =back
 
 =head3 cf::object
@@ -2750,6 +2796,12 @@
 
 # non-persistent channels (usually the info channel)
 our %CHANNEL = (
+   "c/motd" => {
+      id      => "infobox",
+      title   => "MOTD",
+      reply   => undef,
+      tooltip => "The message of the day",
+   },
    "c/identify" => {
       id      => "infobox",
       title   => "Identify",
@@ -2762,6 +2814,12 @@
       reply   => undef,
       tooltip => "Signs and other items you examined",
    },
+   "c/shopinfo" => {
+      id      => "infobox",
+      title   => "Shop Info",
+      reply   => undef,
+      tooltip => "What your bargaining skill tells you about the shop",
+   },
    "c/book" => {
       id      => "infobox",
       title   => "Book",
@@ -3368,11 +3426,13 @@
 }
 
 sub reload_config {
+   warn "reloading config file...\n";
+
    open my $fh, "<:utf8", "$CONFDIR/config"
       or return;
 
    local $/;
-   *CFG = YAML::Load <$fh>;
+   *CFG = YAML::XS::Load scalar <$fh>;
 
    $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
 
@@ -3386,6 +3446,8 @@
       };
       warn $@ if $@;
    }
+
+   warn "finished reloading resource files\n";
 }
 
 sub pidfile() {
@@ -3745,7 +3807,7 @@
 
          warn "reloading cf.pm";
          require cf;
-         cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
+         cf::_connect_to_perl_1;
 
          warn "loading config and database again";
          cf::reload_config;
@@ -3963,6 +4025,7 @@
 
 # load additional modules
 require "cf/$_.pm" for @EXTRA_MODULES;
+cf::_connect_to_perl_2;
 
 END { cf::emergency_save }