--- deliantra/server/lib/cf.pm	2011/04/23 04:46:26	1.562
+++ deliantra/server/lib/cf.pm	2011/05/04 07:36:40	1.569
@@ -1,7 +1,7 @@
 #
 # This file is part of Deliantra, the Roguelike Realtime MMORPG.
 # 
-# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+# Copyright (©) 2006,2007,2008,2009,2010,2011 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 Affero GNU General Public License as published by the
@@ -2071,18 +2071,21 @@
    1
 }
 
+# used to laod the header of an original map
 sub load_header_orig {
    my ($self) = @_;
 
    $self->load_header_from ($self->load_path)
 }
 
+# used to laod the header of an instantiated map
 sub load_header_temp {
    my ($self) = @_;
 
    $self->load_header_from ($self->save_path)
 }
 
+# called after loading the header from an instantiated map
 sub prepare_temp {
    my ($self) = @_;
 
@@ -2093,6 +2096,7 @@
       if $self->{instantiate_time} > $cf::RUNTIME;
 }
 
+# called after loading the header from an original map
 sub prepare_orig {
    my ($self) = @_;
 
@@ -2128,7 +2132,7 @@
 
    cf::cede_to_tick;
 
-   $path = normalise $path, $origin && $origin->path;
+   $path = normalise $path, $origin;
 
    my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
    my $guard2 = cf::lock_acquire "map_find:$path";
@@ -2171,8 +2175,6 @@
       return unless $self->valid;
       return unless $self->in_memory == cf::MAP_SWAPPED;
 
-      $self->in_memory (cf::MAP_LOADING);
-
       $self->alloc;
 
       $self->pre_load;
@@ -2199,8 +2201,13 @@
          }
 
          $f->resolve_delayed_derefs;
+      } else {
+         $self->post_load_original
+            if delete $self->{load_original};
       }
 
+      $self->in_memory (cf::MAP_INACTIVE);
+
       cf::cede_to_tick;
       # now do the right thing for maps
       $self->link_multipart_objects;
@@ -2213,13 +2220,11 @@
          $self->fix_auto_apply;
          $self->update_buttons;
          cf::cede_to_tick;
-         $self->activate;
+         #$self->activate; # no longer activate maps automatically
       }
 
       $self->{last_save} = $cf::RUNTIME;
       $self->last_access ($cf::RUNTIME);
-
-      $self->in_memory (cf::MAP_ACTIVE);
    }
 
    $self->post_load;
@@ -2272,6 +2277,7 @@
 sub find_sync {
    my ($path, $origin) = @_;
 
+   # it's a bug to call this from the main context
    return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
       if $Coro::current == $Coro::main;
 
@@ -2281,6 +2287,7 @@
 sub do_load_sync {
    my ($map) = @_;
 
+   # it's a bug to call this from the main context
    return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
       if $Coro::current == $Coro::main;
 
@@ -2293,10 +2300,10 @@
 sub find_async {
    my ($path, $origin, $load) = @_;
 
-   $path = normalise $path, $origin && $origin->{path};
-
+   $path = normalise $path, $origin;
+   
    if (my $map = $cf::MAP{$path}) {
-      return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
+      return $map if !$load || $map->linkable;
    }
 
    $MAP_PREFETCH{$path} |= $load;
@@ -2365,7 +2372,7 @@
 
    my $lock = cf::lock_acquire "map_data:$self->{path}";
 
-   return if $self->in_memory != cf::MAP_ACTIVE;
+   return if !$self->linkable;
    return if $self->{deny_save};
    return if $self->players;
 
@@ -2814,7 +2821,7 @@
       }
 
       my $map = eval {
-         my $map = defined $path ? cf::map::find $path : undef;
+         my $map = defined $path ? cf::map::find $path, $self->map : undef;
 
          if ($map) {
             $map = $map->customise_for ($self);
@@ -2914,17 +2921,32 @@
       unless (eval {
          $self->deactivate_recursive; # just to be sure
 
-         # random map handling
-         {
+         my $map = cf::map::normalise $exit->slaying, $exit->map;
+         my $x   = $exit->stats->hp;
+         my $y   = $exit->stats->sp;
+
+         # special map handling
+         my $slaying = $exit->slaying;
+
+         # special map handling
+         if ($slaying eq "/!") {
             my $guard = cf::lock_acquire "exit_prepare:$exit";
 
             prepare_random_map $exit
-               if $exit->slaying eq "/!";
-         }
+               if $exit->slaying eq "/!"; # need to re-check after getting the lock
 
-         my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
-         my $x   = $exit->stats->hp;
-         my $y   = $exit->stats->sp;
+            $map = $exit->slaying;
+
+         } elsif ($slaying eq '!up') {
+            $map = $exit->map->tile_path (cf::TILE_UP);
+            $x = $exit->x;
+            $y = $exit->y;
+
+         } elsif ($slaying eq '!down') {
+            $map = $exit->map->tile_path (cf::TILE_DOWN);
+            $x = $exit->x;
+            $y = $exit->y;
+         }
 
          $self->goto ($map, $x, $y);