[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.339 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.342 by root, Sun Aug 26 15:31:02 2007 UTC

 sub do_load_sync {
    my ($map) = @_;
    cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
-      if $Coro::current != $Coro::main;
+      if $Coro::current == $Coro::main;
    cf::sync_job { $map->load };
 }
 our %MAP_PREFETCH;
    my ($path, $origin, $load) = @_;
    $path = normalise $path, $origin && $origin->{path};
    if (my $map = $cf::MAP{$path}) {
-      return $map if $map->in_memory == cf::MAP_IN_MEMORY;
+      return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
    }
    $MAP_PREFETCH{$path} |= $load;
    $MAP_PREFETCHER ||= cf::async {
 The following functions and methods are available within a safe environment:
   cf::object
      contr pay_amount pay_player map x y force_find force_add
-     insert remove name archname title slaying race
+     insert remove name archname title slaying race decrease_ob_nr
   cf::object::player
      player
   cf::player
 =cut
 for (
    ["cf::object"         => qw(contr pay_amount pay_player map force_find force_add x y
-                               insert remove inv name archname title slaying race)],
+                               insert remove inv name archname title slaying race
+                               decrease_ob_nr)],
    ["cf::object::player" => qw(player)],
    ["cf::player"         => qw(peaceful)],
    ["cf::map"            => qw(trigger)],
 ) {
    no strict 'refs';

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines