--- deliantra/server/ext/map-scheduler.ext	2007/01/01 12:28:46	1.2
+++ deliantra/server/ext/map-scheduler.ext	2007/01/02 21:13:22	1.7
@@ -3,15 +3,11 @@
 # this extension swaps out maps and resets them, in essence managing
 # the reset/swap policy of the server.
 
-our $DEACTIVATE_TIMEOUT =   60; # number of seconds after which maps get deactivated to save cpu
-our $SWAP_TIMEOUT       =  600; # number of seconds after which maps inactive get swapped out
-our $SCHEDULE_INTERVAL  =    8; # time the map scheduler sleeps between runs
-our $SAVE_TIMEOUT       =   60; # save maps every n seconds
-our $SAVE_INTERVAL      =  0.4; # save at max. one map every $SAVE_HOLD
-
-$DEACTIVATE_TIMEOUT = 3;#d#
-$SWAP_TIMEOUT = 5;#d#
-$SCHEDULE_INTERVAL = 1;
+our $DEACTIVATE_TIMEOUT =   20; # number of seconds after which maps get deactivated to save cpu
+our $SWAP_TIMEOUT       =   50; # number of seconds after which maps inactive get swapped out
+our $SCHEDULE_INTERVAL  =    2; # time the map scheduler sleeps between runs
+our $SAVE_TIMEOUT       =   30; # save maps every n seconds
+our $SAVE_INTERVAL      =  0.3; # save at max. one map every $SAVE_INTERVAL
 
 our $SCHEDULER = cf::coro {
    while () {
@@ -19,22 +15,22 @@
 
       for my $map (values %cf::MAP) {
          eval {
-            next if $map->players;
-            my $last_access = $map->last_access;
             # not yet, because maps might become visible to players nearby
-            # we need a tiled meta map for this to work
+            # we need to remove the map from %cf::MAP and all tiled map links
 #         if ($last_access + $DEACTIVATE_TIMEOUT <= $cf::RUNTIME) {
 #            $map->deactivate;
 #            delete $map->{active};
 #         }
             if ($map->should_reset) {
                $map->reset;
-            } elsif ($last_access + $SWAP_TIMEOUT <= $cf::RUNTIME) {
-               $map->swap_out;
-               Coro::Timer::sleep $SAVE_INTERVAL;
-            } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
-               $map->save;
-               Coro::Timer::sleep $SAVE_INTERVAL;
+            } elsif ($map->in_memory == cf::MAP_IN_MEMORY) {
+               if ($map->last_access + $SWAP_TIMEOUT <= $cf::RUNTIME && !$map->players) {
+                  $map->swap_out;
+                  Coro::Timer::sleep $SAVE_INTERVAL;
+               } elsif ($map->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
+                  $map->save;
+                  Coro::Timer::sleep $SAVE_INTERVAL;
+               }
             }
          };
          warn $@ if $@;
@@ -42,5 +38,6 @@
       }
    }
 };
+
 $SCHEDULER->prio (-2);