--- deliantra/server/lib/cf.pm	2010/04/16 02:32:25	1.519
+++ deliantra/server/lib/cf.pm	2010/04/28 21:05:33	1.530
@@ -108,10 +108,13 @@
 our $PIDFILE     = "$LOCALDIR/pid";
 our $RUNTIMEFILE = "$LOCALDIR/runtime";
 
-our %RESOURCE;
+our %RESOURCE; # unused
 
-our $OUTPUT_RATE_MIN =   4000;
-our $OUTPUT_RATE_MAX = 100000;
+our $OUTPUT_RATE_MIN =    3000;
+our $OUTPUT_RATE_MAX = 1000000;
+
+our $MAX_LINKS       = 32; # how many chained exits to follow
+our $VERBOSE_IO      = 1;
 
 our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
 our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
@@ -167,6 +170,10 @@
 
 sub cf::map::normalise;
 
+sub in_main() {
+   $Coro::current == $Coro::main
+}
+
 #############################################################################
 
 %REFLECT = ();
@@ -263,7 +270,7 @@
 
    warn Carp::longmess $_[0];
 
-   if ($Coro::current == $Coro::main) {#d#
+   if (in_main) {#d#
       warn "DIEHOOK called in main context, Coro bug?\n";#d#
       return;#d#
    }#d#
@@ -1190,7 +1197,8 @@
       if (length $$rdata) {
          utf8::decode (my $decname = $filename);
          warn sprintf "saving %s (%d,%d)\n",
-            $decname, length $$rdata, scalar @$objs;
+                      $decname, length $$rdata, scalar @$objs
+            if $VERBOSE_IO;
 
          if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
             aio_chmod $fh, SAVE_MODE;
@@ -1257,7 +1265,8 @@
 
    utf8::decode (my $decname = $filename);
    warn sprintf "loading %s (%d,%d)\n",
-      $decname, length $data, scalar @{$av || []};
+                $decname, length $data, scalar @{$av || []}
+      if $VERBOSE_IO;
 
    ($data, $av)
 }
@@ -1438,6 +1447,9 @@
 
                cf::cleanup "mandatory extension '$k' failed to load, exiting."
                   if exists $v->{meta}{mandatory};
+
+               warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
+               delete $todo{$k};
             } else {
                $done{$k} = delete $todo{$k};
                push @EXTS, $v->{pkg};
@@ -1625,7 +1637,6 @@
    $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
    $pl->deactivate;
    my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
-   $pl->ob->check_score;
    $pl->invoke (cf::EVENT_PLAYER_QUIT);
    $pl->ns->destroy if $pl->ns;
 
@@ -1690,6 +1701,8 @@
 
 =item $player->maps
 
+=item cf::player::maps $login
+
 Returns an arrayref of map paths that are private for this
 player. May block.
 
@@ -1761,6 +1774,8 @@
 sub find_by_path($) {
    my ($path) = @_;
 
+   $path =~ s/^~[^\/]*//; # skip ~login
+
    my ($match, $specificity);
 
    for my $region (list) {
@@ -1833,7 +1848,7 @@
 }
 
 # also paths starting with '/'
-$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
+$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
 
 sub thawer_merge {
    my ($self, $merge) = @_;
@@ -2153,6 +2168,7 @@
          or next;
       $neigh->load;
 
+      # now find the diagonal neighbours
       push @neigh,
          [$neigh->tile_path (($_ + 3) % 4), $neigh],
          [$neigh->tile_path (($_ + 1) % 4), $neigh];
@@ -2334,7 +2350,7 @@
 
       $self->unlink_save;
 
-      bless $self, "cf::map";
+      bless $self, "cf::map::wrap";
       delete $self->{deny_reset};
       $self->{deny_save} = 1;
       $self->reset_timeout (1);
@@ -2574,7 +2590,7 @@
 
 The player should be reasonably safe there for short amounts of time (e.g.
 for loading a map). You I<MUST> call C<leave_link> as soon as possible,
-though, as the palyer cannot control the character while it is on the link
+though, as the player cannot control the character while it is on the link
 map.
 
 Will never block.
@@ -2605,6 +2621,8 @@
 
    $self->deactivate_recursive;
 
+   ++$self->{_link_recursion};
+
    return if UNIVERSAL::isa $self->map, "ext::map_link";
 
    $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
@@ -2645,13 +2663,16 @@
    return unless $self->contr->active;
 
    local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
-   $self->enter_map ($map, $x, $y);
+   if ($self->enter_map ($map, $x, $y)) {
+      # entering was successful
+      delete $self->{_link_recursion};
+      # only activate afterwards, to support waiting in hooks
+      $self->activate_recursive;
+   }
 
-   # only activate afterwards, to support waiting in hooks
-   $self->activate_recursive;
 }
 
-=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
+=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
 
 Moves the player to the given map-path and coordinates by first freezing
 her, loading and preparing them map, calling the provided $check callback
@@ -2669,6 +2690,12 @@
 sub cf::object::player::goto {
    my ($self, $path, $x, $y, $check, $done) = @_;
 
+   if ($self->{_link_recursion} >= $MAX_LINKS) {
+      warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
+      $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
+      ($path, $x, $y) = @$EMERGENCY_POSITION;
+   }
+
    # do generation counting so two concurrent goto's will be executed in-order
    my $gen = $self->{_goto_generation} = ++$GOTOGEN;
 
@@ -2701,7 +2728,7 @@
 
          if ($map) {
             $map = $map->customise_for ($self);
-            $map = $check->($map) if $check && $map;
+            $map = $check->($map, $x, $y, $self) if $check && $map;
          } else {
             $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
          }
@@ -2719,7 +2746,7 @@
          $self->leave_link ($map, $x, $y);
       }
 
-      $done->() if $done;
+      $done->($self) if $done;
    })->prio (1);
 }
 
@@ -3403,7 +3430,7 @@
             cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
             cf::face::set_type $idx, $info->{type};
          } else {
-            $RESOURCE{$name} = $info;
+            $RESOURCE{$name} = $info; # unused
          }
 
          cf::cede_to_tick;
@@ -3415,26 +3442,6 @@
    1
 }
 
-cf::global->attach (on_resource_update => sub {
-   if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
-      $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
-
-      for (0 .. SOUND_CAST_SPELL_0 - 1) {
-         my $sound = $soundconf->{compat}[$_]
-            or next;
-
-         my $face = cf::face::find "sound/$sound->[1]";
-         cf::sound::set $sound->[0] => $face;
-         cf::sound::old_sound_index $_, $face; # gcfclient-compat
-      }
-
-      while (my ($k, $v) = each %{$soundconf->{event}}) {
-         my $face = cf::face::find "sound/$v";
-         cf::sound::set $k => $face;
-      }
-   }
-});
-
 register_exticmd fx_want => sub {
    my ($ns, $want) = @_;
 
@@ -3482,10 +3489,32 @@
       or die "unable to load treasurelists\n";
 }
 
+sub reload_sound {
+   0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
+      or die "$DATADIR/sound $!";
+
+   my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
+
+   for (0 .. SOUND_CAST_SPELL_0 - 1) {
+      my $sound = $soundconf->{compat}[$_]
+         or next;
+
+      my $face = cf::face::find "sound/$sound->[1]";
+      cf::sound::set $sound->[0] => $face;
+      cf::sound::old_sound_index $_, $face; # gcfclient-compat
+   }
+
+   while (my ($k, $v) = each %{$soundconf->{event}}) {
+      my $face = cf::face::find "sound/$v";
+      cf::sound::set $k => $face;
+   }
+}
+
 sub reload_resources {
    warn "reloading resource files...\n";
 
    reload_facedata;
+   reload_sound;
    reload_archetypes;
    reload_regions;
    reload_treasures;
@@ -3502,7 +3531,7 @@
    local $/;
    *CFG = YAML::XS::Load scalar <$fh>;
 
-   $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
+   $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
 
    $cf::map::MAX_RESET     = $CFG{map_max_reset}     if exists $CFG{map_max_reset};
    $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
@@ -3787,12 +3816,11 @@
       _gv_clear *{"$pkg$name"};
 #      use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
    }
-   warn "cleared package $pkg\n";#d#
 }
 
 sub do_reload_perl() {
    # can/must only be called in main
-   if ($Coro::current != $Coro::main) {
+   if (in_main) {
       warn "can only reload from main coroutine";
       return;
    }