--- deliantra/server/lib/cf.pm	2008/09/23 00:24:52	1.452
+++ deliantra/server/lib/cf.pm	2008/09/23 04:29:11	1.453
@@ -130,6 +130,8 @@
 our $JITTER;     # average jitter
 our $TICK_START; # for load detecting purposes
 
+our @POST_INIT;
+
 binmode STDOUT;
 binmode STDERR;
 
@@ -307,6 +309,20 @@
 sub encode_json($) { $json_coder->encode ($_[0]) }
 sub decode_json($) { $json_coder->decode ($_[0]) }
 
+=item cf::post_init { BLOCK }
+
+Execute the given codeblock, I<after> all extensions have been (re-)loaded,
+but I<before> the server starts ticking again.
+
+The cdoeblock will have a single boolean argument to indicate whether this
+is a reload or not.
+
+=cut
+
+sub post_init(&) {
+   push @POST_INIT, shift;
+}
+
 =item cf::lock_wait $string
 
 Wait until the given lock is available. See cf::lock_acquire. 
@@ -3343,14 +3359,6 @@
    warn "finished reloading resource files\n";
 }
 
-sub init {
-   my $guard = freeze_mainloop;
-
-   evthread_start IO::AIO::poll_fileno;
-
-   reload_resources;
-}
-
 sub reload_config {
    open my $fh, "<:utf8", "$CONFDIR/config"
       or return;
@@ -3392,7 +3400,20 @@
 }
 
 sub main {
-   atomic;
+   cf::init_globals; # initialise logging
+
+   LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
+   LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
+   LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
+   LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
+
+   cf::init_experience;
+   cf::init_anim;
+   cf::init_attackmess;
+   cf::init_dynamic;
+   cf::init_block;
+
+   $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
 
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
@@ -3403,19 +3424,33 @@
       })->prio (Coro::PRIO_MAX);
    };
 
-   {
-      my $guard = freeze_mainloop;
+   evthread_start IO::AIO::poll_fileno;
+
+   cf::sync_job {
+      reload_resources;
       reload_config;
       db_init;
+
+      cf::load_settings;
+      cf::load_materials;
+      cf::init_uuid;
+      cf::init_signals;
+      cf::init_commands;
+      cf::init_skills;
+
+      cf::init_beforeplay;
+
+      atomic;
+
       load_extensions;
 
-      $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
-   }
+      utime time, time, $RUNTIMEFILE;
 
-   utime time, time, $RUNTIMEFILE;
+      # no (long-running) fork's whatsoever before this point(!)
+      POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
 
-   # no (long-running) fork's whatsoever before this point(!)
-   POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
+      (pop @POST_INIT)->(0) while @POST_INIT;
+   };
 
    EV::loop;
 }
@@ -3689,6 +3724,9 @@
          warn "reattaching attachments to players";
          reattach $_ for values %PLAYER;
 
+         warn "running post_load";
+         (pop @POST_INIT)->(1) while @POST_INIT;
+
          warn "leaving sync_job";
 
          1