--- deliantra/server/lib/cf.pm	2010/04/21 05:48:35	1.526
+++ deliantra/server/lib/cf.pm	2010/04/23 04:32:47	1.527
@@ -110,8 +110,11 @@
 
 our %RESOURCE;
 
-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      = 0;#d#
 
 our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
 our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
@@ -1194,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;
@@ -1261,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)
 }
@@ -2164,6 +2169,7 @@
          or next;
       $neigh->load;
 
+      # now find the diagonal neighbours
       push @neigh,
          [$neigh->tile_path (($_ + 3) % 4), $neigh],
          [$neigh->tile_path (($_ + 1) % 4), $neigh];
@@ -2585,7 +2591,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.
@@ -2616,6 +2622,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]
@@ -2656,14 +2664,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;
-#      unless exists $self->{_link_pos}; # maybe we re in-flight again
 }
 
-=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
@@ -2681,6 +2691,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;
 
@@ -2713,7 +2729,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);
          }
@@ -2731,7 +2747,7 @@
          $self->leave_link ($map, $x, $y);
       }
 
-      $done->() if $done;
+      $done->($self) if $done;
    })->prio (1);
 }
 
@@ -3514,7 +3530,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};