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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.201 by root, Mon Jan 29 18:15:23 2007 UTC vs.
Revision 1.203 by root, Thu Feb 1 19:40:42 2007 UTC

       # get handled first
       my $queue = delete $ns->{query_queue}
          or return; # be conservative, not sure how that can happen, but we saw a crash here
       (shift @$queue)->[1]->($msg);
+      return unless $ns->valid; # temporary(?) workaround for callback destroying socket
       push @{ $ns->{query_queue} }, @$queue;
       if (@{ $ns->{query_queue} } == @$queue) {
          if (@$queue) {
       },
    );
 }
 #############################################################################
-# the server's main()
+# the server's init and main functions
+sub load_resources {
+   load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
+      or die "unable to load regions file\n";#d#
+}
 sub cfg_load {
    open my $fh, "<:utf8", cf::confdir . "/config"
       or return;
          $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
             and die "WARNING: m(un)lockall failed: $!\n";
       };
       warn $@ if $@;
    }
+}
+sub init {
+   load_resources;
 }
 sub main {
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
       warn "reattaching attachments to objects/players";
       _global_reattach;
       warn "reattaching attachments to maps";
       reattach $_ for values %MAP;
+      warn "loading reloadable resources";
+      load_resources;
       warn "restarting server ticker";
       $TICK_WATCHER->start;
    };

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