[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.245 by root, Tue Apr 17 10:06:33 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;
 our $RELOAD; # number of reloads so far
 our @EVENT;
 our $LIBDIR = datadir . "/ext";
-our $TICK = MAX_TIME * 1e-6;
+our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
 our $TICK_WATCHER;
 our $AIO_POLL_WATCHER;
 our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
 our $NEXT_TICK;
 our $NOW;
    }
    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 {
+   warn "reloading resource files...\n";
    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";
+   warn "finished reloading resource files\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;
 }
       }
       $NOW = Event::time;
       cf::server_tick; # one server iteration
       $RUNTIME   += $TICK;
       $NEXT_TICK += $TICK;
       if ($NOW >= $NEXT_RUNTIME_WRITE) {
          $NEXT_RUNTIME_WRITE = $NOW + 10;
             write_runtime
                or warn "ERROR: unable to write runtime file: $!";
          };
       }
+#      my $AFTER = Event::time;
+#      warn $AFTER - $NOW;#d#
+      # if we are delayed by four ticks or more, skip them all
+      $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
+      $TICK_WATCHER->at ($NEXT_TICK);
+      $TICK_WATCHER->start;
       if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
          $sig->send;
       }
       while (my $sig = shift @WAIT_FOR_TICK) {
          $sig->send;
       }
-#      my $AFTER = Event::time;
+      _post_tick;
-#      warn $AFTER - $NOW;#d#
-      # if we are delayed by four ticks or more, skip them all
-      $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
-      $TICK_WATCHER->at ($NEXT_TICK);
-      $TICK_WATCHER->start;
    },
 );
 {
    BDB::max_poll_time $TICK * 0.1;

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.239 by root, Mon Apr 16 06:23:42 2007 UTC vs. Revision 1.245 by root, Tue Apr 17 10:06:33 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.239 by root, Mon Apr 16 06:23:42 2007 UTC vs.
Revision 1.245 by root, Tue Apr 17 10:06:33 2007 UTC