--- deliantra/server/lib/cf.pm	2007/02/17 01:58:55	1.218
+++ deliantra/server/lib/cf.pm	2007/04/10 09:35:23	1.235
@@ -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. 
@@ -356,6 +348,8 @@
 }
 
 sub write_runtime {
+   my $guard = cf::lock_acquire "write_runtime";
+
    my $runtime = cf::localdir . "/runtime";
 
    my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
@@ -381,6 +375,17 @@
    1
 }
 
+=item cf::datalog type => key => value, ...
+
+Log a datalog packet of the given type with the given key-value pairs.
+
+=cut
+
+sub datalog($@) {
+  my ($type, %kv) = @_;
+  warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
+}
+
 =back
 
 =cut
@@ -960,7 +965,7 @@
 sub path($) {
    my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
 
-   (playerdir $login) . "/$login.pl"
+   (playerdir $login) . "/playerdata"
 }
 
 sub find_active($) {
@@ -983,6 +988,13 @@
       my $guard = cf::lock_acquire "user_find:$login";
 
       $cf::PLAYER{$_[0]} || do {
+         # rename old playerfiles to new ones
+         #TODO: remove when no longer required
+         aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
+         aio_link +(playerdir $login) . "/$login.pl"    , (playerdir $login) . "/playerdata";
+         aio_unlink +(playerdir $login) . "/$login.pl.pst";
+         aio_unlink +(playerdir $login) . "/$login.pl";
+
          my $pl = load_pl path $login
             or return;
          $cf::PLAYER{$login} = $pl
@@ -1030,6 +1042,8 @@
 sub quit_character {
    my ($pl) = @_;
 
+   my $name = $pl->ob->name;
+
    $pl->{deny_save} = 1;
    $pl->password ("*"); # this should lock out the player until we nuked the dir
 
@@ -1043,9 +1057,29 @@
    aio_rename $path, $temp;
    delete $cf::PLAYER{$pl->ob->name};
    $pl->destroy;
+
+   my $prefix = qr<^~\Q$name\E/>;
+
+   # nuke player maps
+   $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
+
    IO::AIO::aio_rmtree $temp;
 }
 
+=item $pl->kick
+
+Kicks a player out of the game. This destroys the connection.
+
+=cut
+
+sub kick {
+   my ($pl, $kicker) = @_;
+
+   $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
+   $pl->killer ("kicked");
+   $pl->ns->destroy;
+}
+
 =item cf::player::list_logins
 
 Returns am arrayref of all valid playernames in the system, can take a
@@ -1099,13 +1133,13 @@
    \@paths
 }
 
-=item $player->ext_reply ($msgid, $msgtype, %msg)
+=item $player->ext_reply ($msgid, %msg)
 
 Sends an ext reply to the player.
 
 =cut
 
-sub ext_reply($$$%) {
+sub ext_reply($$%) {
    my ($self, $id, %msg) = @_;
 
    $msg{msgid} = $id;
@@ -1113,6 +1147,18 @@
    $self->send ("ext " . cf::to_json \%msg);
 }
 
+=item $player->ext_event ($type, %msg)
+
+Sends an ext event to the client.
+
+=cut
+
+sub ext_event($$%) {
+   my ($self, $type, %msg) = @_;
+
+   $self->ns->ext_event ($type, %msg);
+}
+
 package cf;
 
 =back
@@ -1928,6 +1974,8 @@
 
    if ($exit->slaying eq "/!") {
       #TODO: this should de-fi-ni-te-ly not be a sync-job
+      # the problem is that $exit might not survive long enough
+      # so it needs to be done right now, right here
       cf::sync_job { prepare_random_map $exit };
    }
 
@@ -1945,9 +1993,9 @@
          1;
       }) {
          $self->message ("Something went wrong deep within the crossfire server. "
-                     . "I'll try to bring you back to the map you were before. "
-                     . "Please report this to the dungeon master!",
-                       cf::NDI_UNIQUE | cf::NDI_RED);
+                       . "I'll try to bring you back to the map you were before. "
+                       . "Please report this to the dungeon master!",
+                         cf::NDI_UNIQUE | cf::NDI_RED);
 
          warn "ERROR in enter_exit: $@";
          $self->leave_link;
@@ -1970,9 +2018,21 @@
    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);
 }
 
+=item $client->ext_event ($type, %msg)
+
+Sends an exti event to the client.
+
+=cut
+
+sub cf::client::ext_event($$%) {
+   my ($self, $type, %msg) = @_;
+
+   $msg{msgtype} = "event_$type";
+   $self->send_packet ("ext " . cf::to_json \%msg);
+}
 
 =item $success = $client->query ($flags, "text", \&cb)
 
@@ -2079,7 +2139,7 @@
 
 =pod
 
-The following fucntions and emthods are available within a safe environment:
+The following functions and methods are available within a safe environment:
 
   cf::object contr pay_amount pay_player map
   cf::object::player player
@@ -2244,9 +2304,55 @@
 #############################################################################
 # the server's init and main functions
 
-sub init_resources {
+sub load_facedata {
+   my $path = sprintf "%s/facedata", cf::datadir;
+
+   warn "loading facedata 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};
+      cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
+      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, $info->{smoothlevel};
+      } 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_facedata
+      or die "unable to load facedata\n";#d#
+}
+
+sub init {
+   reload_resources;
 }
 
 sub cfg_load {
@@ -2270,10 +2376,6 @@
    }
 }
 
-sub init {
-   init_resources;
-}
-
 sub main {
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
@@ -2384,6 +2486,8 @@
          warn "iterate...";
       }
 
+      ++$RELOAD;
+
       warn "cancelling all extension coros";
       $_->cancel for values %EXT_CORO;
       %EXT_CORO = ();
@@ -2450,12 +2554,14 @@
       cf::load_extensions;
 
       warn "reattaching attachments to objects/players";
-      _global_reattach;
+      _global_reattach; # objects, sockets
       warn "reattaching attachments to maps";
       reattach $_ for values %MAP;
+      warn "reattaching attachments to players";
+      reattach $_ for values %PLAYER;
 
       warn "loading reloadable resources";
-      init_resources;
+      reload_resources;
 
       warn "leaving sync_job";