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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.239 by root, Mon Apr 16 06:23:42 2007 UTC vs.
Revision 1.244 by root, Mon Apr 16 13:28:00 2007 UTC

 use Event;
 use Opcode;
 use Safe;
 use Safe::Hole;
-use Coro 3.52 ();
+use Coro 3.61 ();
 use Coro::State;
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
 use Coro::Semaphore;
    }
    1
 }
+sub load_archetypes {
+   load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable
+   load_archetype_file sprintf "%s/archetypes", cf::datadir
+}
+sub load_treasures {
+   load_treasure_file sprintf "%s/treasures", cf::datadir
+}
 sub reload_resources {
    load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
-      or die "unable to load regions file\n";#d#
+      or die "unable to load regions file\n";
    load_facedata
-      or die "unable to load facedata\n";#d#
+      or die "unable to load facedata\n";
+   load_archetypes
+      or die "unable to load archetypes\n";
+   load_treasures
+      or die "unable to load treasurelists\n";
 }
 sub init {
    reload_resources;
 }
 our @WAIT_FOR_TICK;
 our @WAIT_FOR_TICK_BEGIN;
 sub wait_for_tick {
+   return unless $TICK_WATCHER->is_active;
+   return if $Coro::current == $Coro::main;
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK, $signal;
    $signal->wait;
 }
 sub wait_for_tick_begin {
+   return unless $TICK_WATCHER->is_active;
+   return if $Coro::current == $Coro::main;
    my $signal = new Coro::Signal;
    push @WAIT_FOR_TICK_BEGIN, $signal;
    $signal->wait;
 }

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