--- deliantra/server/lib/cf.pm	2007/03/06 03:06:00	1.222
+++ deliantra/server/lib/cf.pm	2007/03/23 18:32:48	1.227
@@ -6,11 +6,13 @@
 use Symbol;
 use List::Util;
 use Storable;
+use Event;
 use Opcode;
 use Safe;
 use Safe::Hole;
 
-use Coro 3.5 ();
+use Coro 3.52 ();
+use Coro::State;
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
@@ -21,22 +23,25 @@
 use Data::Dumper;
 use Digest::MD5;
 use Fcntl;
-use IO::AIO 2.32 ();
 use YAML::Syck ();
+use IO::AIO 2.32 ();
 use Time::HiRes;
 use Compress::LZF;
 
+# configure various modules to our taste
+#
+Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
 
-use Event; $Event::Eval = 1; # no idea why this is required, but it is
-
-sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
+$Event::Eval = 1; # no idea why this is required, but it is
 
 # work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
 $YAML::Syck::ImplicitUnicode = 1;
 
 $Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
 
+sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
+
 our %COMMAND      = ();
 our %COMMAND_TIME = ();
 
@@ -45,6 +50,7 @@
 our %EXT_CORO     = (); # coroutines bound to extensions
 our %EXT_MAP      = (); # pluggable maps
 
+our $RELOAD; # number of reloads so far
 our @EVENT;
 our $LIBDIR = datadir . "/ext";
 
@@ -204,30 +210,16 @@
    } || "[unable to dump $_[0]: '$@']";
 }
 
-use JSON::Syck (); # TODO# replace by JSON::PC once working
+use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
 
 =item $ref = cf::from_json $json
 
 Converts a JSON string into the corresponding perl data structure.
 
-=cut
-
-sub from_json($) {
-   $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
-   JSON::Syck::Load $_[0]
-}
-
 =item $json = cf::to_json $ref
 
 Converts a perl data structure into its JSON representation.
 
-=cut
-
-sub to_json($) {
-   $JSON::Syck::ImplicitUnicode = 0;  # work around JSON::Syck bugs
-   JSON::Syck::Dump $_[0]
-}
-
 =item cf::lock_wait $string
 
 Wait until the given lock is available. See cf::lock_acquire. 
@@ -1994,7 +1986,7 @@
    my ($self, $text, $flags) = @_;
 
    utf8::encode $text;
-   $self->send_packet (sprintf "drawinfo %d %s", $flags, $text);
+   $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
 }
 
 
@@ -2268,9 +2260,54 @@
 #############################################################################
 # the server's init and main functions
 
-sub init_resources {
+sub load_faces {
+   my $path = sprintf "%s/faces", cf::datadir;
+
+   warn "loading faces from $path\n";
+
+   my $faces;
+   0 < aio_load $path, $faces
+      or die "$path: $!";
+
+   Coro::cede;
+   $faces = Storable::thaw $faces;
+   Coro::cede;
+
+   my $meta = delete $faces->{""};
+   $meta->{version} == 1
+      or cf::cleanup "$path: version mismatch, cannot proceed.";
+
+   while (my ($face, $info) = each %$faces) {
+      my $idx = (cf::face::find $face) || cf::face::alloc $face;
+      cf::face::set $idx, $info->{visibility}, $info->{magicmap};
+      cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
+      Coro::cede;
+   }
+
+   while (my ($face, $info) = each %$faces) {
+      next unless $info->{smooth};
+      my $idx = cf::face::find $face
+         or next;
+      if (my $smooth = cf::face::find $info->{smooth}) {
+         cf::face::set_smooth $idx, $smooth;
+      } else {
+         warn "smooth face '$info->{smooth}' not found for face '$face'";
+      }
+      Coro::cede;
+   }
+
+   1
+}
+
+sub reload_resources {
    load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
       or die "unable to load regions file\n";#d#
+   load_faces
+      or die "unable to load faces\n";#d#
+}
+
+sub init {
+   reload_resources;
 }
 
 sub cfg_load {
@@ -2294,10 +2331,6 @@
    }
 }
 
-sub init {
-   init_resources;
-}
-
 sub main {
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
@@ -2408,6 +2441,8 @@
          warn "iterate...";
       }
 
+      ++$RELOAD;
+
       warn "cancelling all extension coros";
       $_->cancel for values %EXT_CORO;
       %EXT_CORO = ();
@@ -2481,7 +2516,7 @@
       reattach $_ for values %PLAYER;
 
       warn "loading reloadable resources";
-      init_resources;
+      reload_resources;
 
       warn "leaving sync_job";